Updated FormMacros library code