Add check for expireDate