Chris, I'm not familiar with syntax of classes_def.xml file, so I may guess what needs to be added, but it would be better if someone who knows this syntax will add required clean-up changes.