Added boolean and date fields
Handle multiple rows on dashboard