Added Measurement classes