Updated the project setup