Fixed value name
Added global and local macros storage