Use KeyValueBuilder where possible