Added container support