Add containers to DNS objects

Work in progress