Remove base domain id hardcoded