More work on objects storage
Object storage refactoring
Added docstrings