Added support for start and end dates
Added support for highlight colors