Adding cross domain support