Move authorization check one level up