TimeMaps were left out of the refactoring and have been 'fixed' now; integration tests have been updated