Adding domain support