Added classes for measurements