[FIX] Fixed project setup for CJAMacros and updated