Updated the common_domain engine