expire_in now handles units other than hour