Add preflight and stomp