Shouldn't the identifier and the expiry variables be used here?