Modified aat to use container tag's auto-discovery.