Added forms and entities