Added support for extended calendar attributes