Change type signature from Long to FiniteDuration