Added user model back in