Removed interface and all refs, initial store entity