Updated subproject building rules