Changed the way we extend the OrganizationalPerson to follow the same implementation as the users module