Changes to support interface of Measure class