Add insert_type and subsetting_key_val_separator