Changed Date attributes to Calendar.
Changes Generator Strategy to TABLE