Moved some selections into the user model