Add subproject support