Modified hostnames to allow tenant domain definition