Ported XML Summer School 2012 enhancements to the core library