Use expiresAt rather than tempCreatedAt