Add kvazaar and subnetcalc