Updated more for these for UML stuff.