Update to support latest from Abacus.