Updated forms and notifications