Updated to use the domain module.