Major v2 update with other condor-related additions