Made the project system much friendlier