added calendar and basic required fields