Update to match changes to ABTools