Improve decl_auth override