more refactoring of storage and starting on queryProperty support