Improve data container support.