[Pofile and entity refactoring]