ORCOMP-27 Refactors RefreshValues method
ORCOMP-27 Adds units