Add support for custom keynames in builders