Add TermsOfUse data marking structure and tests