Added support for PilotTool