Added data store class