Added devise and restriction