Added default domain support