Added subpart count