More enhancements to Crossover module.