Fix references & Add projects