Added support for PilotTool and CompatibilityMode