Unique ID variable now properly being set in the generated code.