changed to add dns/domain support