Splitting some elements out of gatekeeper