Support optional contigset reference