key is now always path and change opt by path dictionary storage