Better support for encrypted secrets