Adds ContainerManager
Changes get_container_by_channel lookups