Fixing project setup + Persistence