Added W3C input to handle custom fields