Removed the base class as it was causing issues for the data store.