Project class and derived classes changes