Move Gatekeeper into Context