Changed Users model some