Maybe it should move to the api and bring it back to the api when we implement the ContainerEventListener.