Update UML target to 3.10 and various improvements