Person model refactoring