Issue #84,Add UMLs and removed old ones