Updated User model, added/updated properties to work with the enterprise wsdl