changed User model to reflect dependencies