changes to handle xapi url