Remove map dependency from user model