Removed the repeated class definition MACRO