Minor Indentation Fixes and DomainName Support

Minor Indentation Fixes and DomainName Support