Fixed TODO notes within the Performance code.
Added import statement for macros within the Foundation file.