Add support for domains and records