Added many fields to flat table and form