Added support for calendar and date arithmetic