Finish roster model and updated user model