Added abstraction of measures