Extend wizard and calendar support