Revert "Revert "(re)added ad containers""

This reverts commit cdbbc7a548b8d4e16a25493e7432f99c9143fbdd.