Improve new xml format parse/definition