Adding support for Calendar Chart
Had to rename the calendar_chart back to calendar becuase of the package_name syntax