Update the NSTools things to work with CATTools