Fixing Storage Facade