Added type field for the forms