addCSCstubs is True by default