Token-Macro Support

Modified the Env variable parsing to support Token-Macro plugin. Also made the macro supported on all fields.