Add container support