Stop hard coding domain name