Updated code for domain change.