change models for better user management