start preparing for separate entity storages