Fixed minor issues and generated UModel representation
Authored by: philsp 2012-06-11
Parent: [r709]
Child: [r711]