Change: [Warden] Add scope and support return_to