Changes to reflect the new APIs