Revamped how to track container id