+ changed Measurement class to work better with huge amount of data