Add support for encrypted values