Updated subprojects and TODO