Changes to reflect new API