Added --tool_macro_fields