added devise and some new columns