Added a user to the model and some other improvements