Added enum fields for the grid