Updated Authorization Behaviour