entities refactor