Pulled in reverse engineering code
Introduced indirection in Java2UML reverse logic