Add key configuration capability #6