Move the storage implementation to inside storage classes