Subproject support & Dist task instead of stage