NCBC-166: Allow full fidelity of keys