Basic changes to reflect new API