alle entities refactored