Merge "Move UserTypeDetails & UserTypeFactory to services"