Updated User types to account for POST and GET user types being slightly different.  More updates to company type