Entity and Map-based storage ready