UNITSOFMEASUREMENT-82: EDR 
Updated UML
Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-82