Refactor storage extension in models
Merge branch 'master' of github.com:otvorenesudy/otvorenesudy-dev