Added configuration detection and XEM configuration