Update content to the new validation functions