Accomodated for refactor of measurement class