#71 Auto-register the container as itself