Add pervasive key support