Adding complete support for base domain information