Add timeSince and improve duration