Entities file is back because of offline development.
Tiny refactoring.