Improve data container support.
Merge pull request #6 from drupalwxt/master

Improve data container support.