Update for cross domain issue