Simplification of storage objects
Added objects metadata and indexes + query by index