Added conditional decorators for auth