Added functions to get the contact type
User entity namespace fixes