better secret key support