Add possibility to not use default domain