Completed Macros and Locals module