Added support for calendar module