Added equivalent domain support, ws changes