Adding support for domain option