added devise & user model