Added measurement data classes
Added more personal data