Added some user models and removed some helpers