Change to reflect new API