Added measurement as a class