Moved hasing to user class, small updates to models and resources