Changed calendars to dates. Updated serialization of measurements.