Changes for new API schema