Add CalendarSerializer
Modified to final class the DateSerializer