Update api to match implementation