entity model refactoring: strong types