Added fields to add/modify Form