Added Duration class, so there's no longer any ambiguity in time units