Added new forms and options