Added missing User and UserType models in main package.