Changes to accomodate new domains.