Fleshing out the revised api