Support XC5 and XC6 for testing for now