Added data-only-contents support