Update to new API schema