Added cross-domain support