Feature/user model associations