hdm uml and xml input models fixes