added container support and fixes