Removed all non-store dependencies. Only Raw BaseStore is now working properly and annotations