Renamed measures, fixed timestamp measures and added one new