Updated project setup