renovated the IStorageQuery to make it less JPA centric and less generic