Added ContainerInterface support