Added the xml classes back.