Improved tokenizer: got all field descriptors of builder