Add Support of Calendar in spaces