Added enhancedDebug option