Added devise etc