EST-408b: refactor modify functions to change functions due to the ISIS METAMODEL VALIDATION ERRORS and for ticket 408b class Unit