Added #define directive and upgraded Macros