Add User model and associations