EXPERIMENTAL - Add support for character-based primary keys