refactoring translator, add storages