I think using package_id instead of subsite_id would cover both as the subsite use case would be a subset of the package_id use case...