DEVOPS-441: Support for new api response format