Fix issues with ContainerInfo and use protobufs properly