Updated forms to include required fields