Added support for projects including subprojects