Add Space and Domain control