Xml support rebuilded in more Spring'y way.