Pulled a common base for storage and used it in InMemoryStorage
Using common base on PostgresStore