Add form data-attributes treatment