Changed calendars to dates. Improved serialization for measurements.