Add support for arbitrary binary keys