User Model update to fit the convention