Updated to work with the changes made to Abacus.