Added forms and database