Adding linked container support