better container support