UML enhancement

Upgraded object model creation for UML