Update to EF6
Fix logic for storages