Changes made for new apiclient