Updated to support Calendargrams