Branch 'python/master' - 31 commits - .gitignore schemas/incidence.xsd testfiles/testcontact.xml testfiles/testevent.xml testfiles/testnote.xml

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Jan 2 14:04:30 CET 2012


 .gitignore                |    6 ++
 schemas/incidence.xsd     |  117 +++++++++++++++++++---------------------------
 testfiles/testcontact.xml |    2 
 testfiles/testevent.xml   |   20 +++----
 testfiles/testnote.xml    |    2 
 5 files changed, 68 insertions(+), 79 deletions(-)

New commits:
commit 74b6ae2ec37836296b1349bf458faf0b164a360c
Merge: cf06466 e03dec1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jan 2 14:04:19 2012 +0100

    Merge branch 'python/master' of ssh://git.kolab.org/git/libkolabxml into python/master
    
    Conflicts:
    	.gitignore



commit cf06466bfcf9329be52f8a6dd5659f07c68ac963
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 15:22:50 2011 +0100

    Insert license headers in Python code files

diff --git a/pykolab/__init__.py b/pykolab/__init__.py
index e69de29..3ceec57 100644
--- a/pykolab/__init__.py
+++ b/pykolab/__init__.py
@@ -0,0 +1,13 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
\ No newline at end of file
diff --git a/pykolab/contact.py b/pykolab/contact.py
index c4611fe..fa22de9 100644
--- a/pykolab/contact.py
+++ b/pykolab/contact.py
@@ -1,3 +1,17 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import datetime
 import pykolab.format
 
diff --git a/pykolab/format.py b/pykolab/format.py
index 459e803..8c1978e 100644
--- a/pykolab/format.py
+++ b/pykolab/format.py
@@ -1,3 +1,17 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 from pykolab.raw.format import *
 
 import pyxb.namespace


commit bb146de53a372cdcd6e721b09acf55d3491e8810
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 15:02:46 2011 +0100

    LGPLv3 instead of GPLv3

diff --git a/COPYING b/COPYING
index 94a9ed0..65c5ca8 100644
--- a/COPYING
+++ b/COPYING
@@ -1,674 +1,165 @@
-                    GNU GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.


commit 66542d387e73d392181dbbaacbb2db04159cc010
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 14:45:42 2011 +0100

    Update test-contact to attempt to read from and write to a document ensuring the content is the same.

diff --git a/tests/test-contact.py b/tests/test-contact.py
index e0196bc..ed4f816 100644
--- a/tests/test-contact.py
+++ b/tests/test-contact.py
@@ -1,5 +1,6 @@
 import pyxb
 
+import os
 import sys
 import unittest
 
@@ -9,6 +10,10 @@ from pykolab.format import Name
 from pykolab.format import SMTPContact
 from pykolab.format import UID
 
+from pykolab.format import CreateFromDocument
+
+import pykolab.raw.format
+
 class TestContact(unittest.TestCase):
     """
         Test creating / writing a contact
@@ -98,5 +103,25 @@ class TestContact(unittest.TestCase):
         self.assertEqual("Jeroen", mycontact.name.given_name)
         self.assertEqual("van Meeuwen", mycontact.name.last_name)
 
+    def testContactMinimalFromXML(self):
+        xml = open(os.path.join(os.path.dirname(__file__), '..', 'testfiles', "testContactMinimalFromXML.xml")).read().strip()
+        mycontact = CreateFromDocument(xml)
+
+        # Test creation
+
+        # CreateFromDocument creates it's contact in raw format object instances.
+        # This is what we *expect*, but not necessarily what we *want*, as the
+        # objects created from documents will then have no callable shortcut API
+        # functions we so carefully created for them.
+        self.assertTrue(isinstance(mycontact, pykolab.raw.format.Contact))
+        self.assertFalse(isinstance(mycontact, pykolab.format.Contact))
+        self.assertFalse(isinstance(mycontact, Contact))
+
+        self.assertTrue(isinstance(mycontact.email, list))
+        self.assertEqual(1, len(mycontact.email))
+        self.assertTrue(isinstance(mycontact.email[0], SMTPContact))
+        self.assertEqual("vanmeeuwen at kolabsys.com", mycontact.email[0].smtp_address)
+        self.assertEqual(xml, mycontact.toxml())
+
 if __name__ == '__main__':
     unittest.main()


commit 2f6e88794bf2002a77605d8f6074caad7d044574
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 12:08:57 2011 +0100

    Update configure.ac to include po/Makefile.in

diff --git a/configure.ac b/configure.ac
index 18688ae..7637b14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`)
 
 AC_CONFIG_FILES([
 Makefile
+po/Makefile.in
 pykolab-format.spec
 ])
 


commit 8afa195b480ffda2f3af75dce23c1f7d5fd1c6e1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 12:08:47 2011 +0100

    Ignore po/stamp-it

diff --git a/.gitignore b/.gitignore
index dd965cf..6a1480f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ config.status
 configure
 po/*.gmo
 po/POTFILES
+po/stamp-it
 pykolab-[0-9]*.*/


commit 1f4d457e01bd31df2fbbb828cfe66d262267b437
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 11:59:15 2011 +0100

    Based on newly generated bindings...

diff --git a/pykolab/raw/format.py b/pykolab/raw/format.py
index ac47798..72f5a68 100644
--- a/pykolab/raw/format.py
+++ b/pykolab/raw/format.py
@@ -1,7 +1,7 @@
 # ./pykolab/raw/format.py
 # PyXB bindings for NamespaceModule
 # NSM:627e20d8ff2455aff19af8f568d2295daed9a405
-# Generated 2011-10-23 17:43:09.571445 by PyXB version 1.1.2
+# Generated 2011-10-25 11:14:34.187182 by PyXB version 1.1.2
 import pyxb
 import pyxb.binding
 import pyxb.binding.saxer
@@ -11,7 +11,7 @@ import pyxb.utils.domutils
 import sys
 
 # Unique identifier for bindings created at the same time
-_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:16db1f1e-fd96-11e0-ad63-001f3c5996b7')
+_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:22a05460-fef2-11e0-8906-001f3c5996b7')
 
 # Import bindings for namespaces imported into schema
 import pyxb.binding.datatypes
@@ -43,6 +43,20 @@ def CreateFromDOM (node, default_namespace=None):
 
 
 # Atomic SimpleTypeDefinition
+class Color (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
+    _Documentation = None
+Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
+Color._CF_pattern = pyxb.binding.facets.CF_pattern()
+Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
+Color._InitializeFacetMap(Color._CF_length,
+   Color._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Color', Color)
+
+# Atomic SimpleTypeDefinition
 class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
 
     """An atomic simple type."""
@@ -84,20 +98,6 @@ Cycle._InitializeFacetMap(Cycle._CF_enumeration)
 Namespace.addCategoryObject('typeBinding', u'Cycle', Cycle)
 
 # Atomic SimpleTypeDefinition
-class Color (pyxb.binding.datatypes.string):
-
-    """An atomic simple type."""
-
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
-    _Documentation = None
-Color._CF_pattern = pyxb.binding.facets.CF_pattern()
-Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
-Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
-Color._InitializeFacetMap(Color._CF_pattern,
-   Color._CF_length)
-Namespace.addCategoryObject('typeBinding', u'Color', Color)
-
-# Atomic SimpleTypeDefinition
 class UID (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
@@ -142,33 +142,115 @@ class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
 Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
 
 
-# Complex type XMLBase with content type ELEMENT_ONLY
-class XMLBase (pyxb.binding.basis.complexTypeDefinition):
+# Complex type SMTPContact with content type ELEMENT_ONLY
+class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'XMLBase')
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}link-attachment uses Python identifier link_attachment
-    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__httpkolab_org_XMLBase_httpkolab_orglink_attachment', True)
+    # Element {http://kolab.org}display-name uses Python identifier display_name
+    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
 
     
-    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
+    display_name = property(__display_name.value, __display_name.set, None, None)
 
     
-    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
-    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
+    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
+    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
 
     
-    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+
+
+    _ElementMap = {
+        __display_name.name() : __display_name,
+        __smtp_address.name() : __smtp_address
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
 
+
+# Complex type Address with content type ELEMENT_ONLY
+class Address (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}categories uses Python identifier categories
-    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
+    # Element {http://kolab.org}street uses Python identifier street
+    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
 
     
-    categories = property(__categories.value, __categories.set, None, None)
+    street = property(__street.value, __street.set, None, None)
+
+    
+    # Element {http://kolab.org}country uses Python identifier country
+    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
+
+    
+    country = property(__country.value, __country.set, None, None)
+
+    
+    # Element {http://kolab.org}postal-code uses Python identifier postal_code
+    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
+
+    
+    postal_code = property(__postal_code.value, __postal_code.set, None, None)
+
+    
+    # Element {http://kolab.org}locality uses Python identifier locality
+    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
+
+    
+    locality = property(__locality.value, __locality.set, None, None)
+
+    
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
+
+    
+    type = property(__type.value, __type.set, None, None)
+
+    
+    # Element {http://kolab.org}region uses Python identifier region
+    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
+
+    
+    region = property(__region.value, __region.set, None, None)
+
+
+    _ElementMap = {
+        __street.name() : __street,
+        __country.name() : __country,
+        __postal_code.name() : __postal_code,
+        __locality.name() : __locality,
+        __type.name() : __type,
+        __region.name() : __region
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Address', Address)
+
+
+# Complex type XMLBase with content type ELEMENT_ONLY
+class XMLBase (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'XMLBase')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {http://kolab.org}link-attachment uses Python identifier link_attachment
+    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__httpkolab_org_XMLBase_httpkolab_orglink_attachment', True)
+
+    
+    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
 
     
     # Element {http://kolab.org}sensitivity uses Python identifier sensitivity
@@ -185,6 +267,13 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     body = property(__body.value, __body.set, None, None)
 
     
+    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
+    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
+
+    
+    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+
+    
     # Element {http://kolab.org}creation-date uses Python identifier creation_date
     __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
 
@@ -213,6 +302,13 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
 
     
+    # Element {http://kolab.org}categories uses Python identifier categories
+    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
+
+    
+    categories = property(__categories.value, __categories.set, None, None)
+
+    
     # Attribute version uses Python identifier version
     __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'3.0dev1')
     
@@ -221,14 +317,14 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
 
     _ElementMap = {
         __link_attachment.name() : __link_attachment,
-        __inline_attachment.name() : __inline_attachment,
-        __categories.name() : __categories,
         __sensitivity.name() : __sensitivity,
         __body.name() : __body,
+        __inline_attachment.name() : __inline_attachment,
         __creation_date.name() : __creation_date,
         __uid.name() : __uid,
         __product_id.name() : __product_id,
-        __last_modification_date.name() : __last_modification_date
+        __last_modification_date.name() : __last_modification_date,
+        __categories.name() : __categories
     }
     _AttributeMap = {
         __version.name() : __version
@@ -246,10 +342,6 @@ class Incidence (XMLBase):
     
     # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-    
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-    
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}creator uses Python identifier creator
@@ -259,12 +351,9 @@ class Incidence (XMLBase):
     creator = property(__creator.value, __creator.set, None, None)
 
     
-    # Element {http://kolab.org}organizer uses Python identifier organizer
-    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    organizer = property(__organizer.value, __organizer.set, None, None)
-
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}recurrence uses Python identifier recurrence
     __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
@@ -273,13 +362,7 @@ class Incidence (XMLBase):
     recurrence = property(__recurrence.value, __recurrence.set, None, None)
 
     
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-    
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-    
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-    
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}attendee uses Python identifier attendee
     __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
@@ -288,7 +371,11 @@ class Incidence (XMLBase):
     attendee = property(__attendee.value, __attendee.set, None, None)
 
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}alarm uses Python identifier alarm
     __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
@@ -297,6 +384,13 @@ class Incidence (XMLBase):
     alarm = property(__alarm.value, __alarm.set, None, None)
 
     
+    # Element {http://kolab.org}organizer uses Python identifier organizer
+    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
+
+    
+    organizer = property(__organizer.value, __organizer.set, None, None)
+
+    
     # Element {http://kolab.org}location uses Python identifier location
     __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
 
@@ -304,6 +398,8 @@ class Incidence (XMLBase):
     location = property(__location.value, __location.set, None, None)
 
     
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    
     # Element {http://kolab.org}summary uses Python identifier summary
     __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Incidence_httpkolab_orgsummary', False)
 
@@ -316,10 +412,10 @@ class Incidence (XMLBase):
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
         __creator.name() : __creator,
-        __organizer.name() : __organizer,
         __recurrence.name() : __recurrence,
         __attendee.name() : __attendee,
         __alarm.name() : __alarm,
+        __organizer.name() : __organizer,
         __location.name() : __location,
         __summary.name() : __summary
     })
@@ -330,252 +426,369 @@ class Incidence (XMLBase):
 Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
 
 
-# Complex type Task with content type ELEMENT_ONLY
-class Task (Incidence):
+# Complex type Event with content type ELEMENT_ONLY
+class Event (Incidence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
     # Base type is Incidence
     
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
-    
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
+    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
+
     
-    # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
+    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
 
     
-    status = property(__status.value, __status.set, None, None)
+    # Element {http://kolab.org}end-date uses Python identifier end_date
+    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
 
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+    end_date = property(__end_date.value, __end_date.set, None, None)
+
     
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-    
-    # Element {http://kolab.org}parent uses Python identifier parent
-    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
-
-    
-    parent = property(__parent.value, __parent.set, None, None)
-
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
     # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    start_date = property(__start_date.value, __start_date.set, None, None)
-
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}completed uses Python identifier completed
-    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    completed = property(__completed.value, __completed.set, None, None)
-
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
     # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}color-label uses Python identifier color_label
+    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
+
     
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+    color_label = property(__color_label.value, __color_label.set, None, None)
+
     
-    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}due-date uses Python identifier due_date
-    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
 
     
-    due_date = property(__due_date.value, __due_date.set, None, None)
+    start_date = property(__start_date.value, __start_date.set, None, None)
 
     
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    
     # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}priority uses Python identifier priority
-    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = Incidence._ElementMap.copy()
+    _ElementMap.update({
+        __show_time_as.name() : __show_time_as,
+        __end_date.name() : __end_date,
+        __color_label.name() : __color_label,
+        __start_date.name() : __start_date
+    })
+    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Event', Event)
+
 
+# Complex type Attendee with content type ELEMENT_ONLY
+class Attendee (SMTPContact):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Attendee')
+    # Base type is SMTPContact
     
-    priority = property(__priority.value, __priority.set, None, None)
+    # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
+    
+    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+    
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Attendee_httpkolab_orgstatus', False)
 
     
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    status = property(__status.value, __status.set, None, None)
+
     
-    # Attribute version inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}role uses Python identifier role
+    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_Attendee_httpkolab_orgrole', False)
 
-    _ElementMap = Incidence._ElementMap.copy()
+    
+    role = property(__role.value, __role.set, None, None)
+
+    
+    # Element {http://kolab.org}request-response uses Python identifier request_response
+    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_Attendee_httpkolab_orgrequest_response', False)
+
+    
+    request_response = property(__request_response.value, __request_response.set, None, None)
+
+
+    _ElementMap = SMTPContact._ElementMap.copy()
     _ElementMap.update({
         __status.name() : __status,
-        __parent.name() : __parent,
-        __start_date.name() : __start_date,
-        __completed.name() : __completed,
-        __due_date.name() : __due_date,
-        __priority.name() : __priority
+        __role.name() : __role,
+        __request_response.name() : __request_response
     })
-    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap = SMTPContact._AttributeMap.copy()
     _AttributeMap.update({
         
     })
-Namespace.addCategoryObject('typeBinding', u'Task', Task)
+Namespace.addCategoryObject('typeBinding', u'Attendee', Attendee)
 
 
-# Complex type Address with content type ELEMENT_ONLY
-class Address (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Name with content type ELEMENT_ONLY
+class Name (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}street uses Python identifier street
-    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
+    # Element {http://kolab.org}prefix uses Python identifier prefix
+    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
 
     
-    street = property(__street.value, __street.set, None, None)
+    prefix = property(__prefix.value, __prefix.set, None, None)
 
     
-    # Element {http://kolab.org}country uses Python identifier country
-    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
+    # Element {http://kolab.org}middle-names uses Python identifier middle_names
+    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
 
     
-    country = property(__country.value, __country.set, None, None)
+    middle_names = property(__middle_names.value, __middle_names.set, None, None)
 
     
-    # Element {http://kolab.org}postal-code uses Python identifier postal_code
-    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
+    # Element {http://kolab.org}last-name uses Python identifier last_name
+    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
 
     
-    postal_code = property(__postal_code.value, __postal_code.set, None, None)
+    last_name = property(__last_name.value, __last_name.set, None, None)
 
     
-    # Element {http://kolab.org}locality uses Python identifier locality
-    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
+    # Element {http://kolab.org}full-name uses Python identifier full_name
+    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
 
     
-    locality = property(__locality.value, __locality.set, None, None)
+    full_name = property(__full_name.value, __full_name.set, None, None)
 
     
-    # Element {http://kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
+    # Element {http://kolab.org}suffix uses Python identifier suffix
+    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
 
     
-    type = property(__type.value, __type.set, None, None)
+    suffix = property(__suffix.value, __suffix.set, None, None)
 
     
-    # Element {http://kolab.org}region uses Python identifier region
-    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
+    # Element {http://kolab.org}initials uses Python identifier initials
+    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
 
     
-    region = property(__region.value, __region.set, None, None)
+    initials = property(__initials.value, __initials.set, None, None)
+
+    
+    # Element {http://kolab.org}given-name uses Python identifier given_name
+    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
+
+    
+    given_name = property(__given_name.value, __given_name.set, None, None)
 
 
     _ElementMap = {
-        __street.name() : __street,
-        __country.name() : __country,
-        __postal_code.name() : __postal_code,
-        __locality.name() : __locality,
-        __type.name() : __type,
-        __region.name() : __region
+        __prefix.name() : __prefix,
+        __middle_names.name() : __middle_names,
+        __last_name.name() : __last_name,
+        __full_name.name() : __full_name,
+        __suffix.name() : __suffix,
+        __initials.name() : __initials,
+        __given_name.name() : __given_name
     }
     _AttributeMap = {
         
     }
-Namespace.addCategoryObject('typeBinding', u'Address', Address)
+Namespace.addCategoryObject('typeBinding', u'Name', Name)
 
 
-# Complex type Event with content type ELEMENT_ONLY
-class Event (Incidence):
+# Complex type RecurrenceType with content type EMPTY
+class RecurrenceType (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'RecurrenceType')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_RecurrenceType_type', pyxb.binding.datatypes.string)
+    
+    type = property(__type.value, __type.set, None, None)
+
+
+    _ElementMap = {
+        
+    }
+    _AttributeMap = {
+        __type.name() : __type
+    }
+Namespace.addCategoryObject('typeBinding', u'RecurrenceType', RecurrenceType)
+
+
+# Complex type Recurrence with content type ELEMENT_ONLY
+class Recurrence (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
-    # Base type is Incidence
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
-    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
+    # Element {http://kolab.org}rangetype uses Python identifier rangetype
+    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
 
     
-    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
+    rangetype = property(__rangetype.value, __rangetype.set, None, None)
 
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}interval uses Python identifier interval
+    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
+
     
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    interval = property(__interval.value, __interval.set, None, None)
+
     
-    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}exclusion uses Python identifier exclusion
+    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
+
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+
+
+    _ElementMap = {
+        __rangetype.name() : __rangetype,
+        __interval.name() : __interval,
+        __exclusion.name() : __exclusion
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+
+
+# Complex type Task with content type ELEMENT_ONLY
+class Task (Incidence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
+    # Base type is Incidence
+    
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
+    
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+    
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+    
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
     
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}color-label uses Python identifier color_label
-    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
+    # Element {http://kolab.org}priority uses Python identifier priority
+    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
 
     
-    color_label = property(__color_label.value, __color_label.set, None, None)
+    priority = property(__priority.value, __priority.set, None, None)
 
     
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}parent uses Python identifier parent
+    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
+
     
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+    parent = property(__parent.value, __parent.set, None, None)
+
     
     # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
-    
     # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}end-date uses Python identifier end_date
-    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}completed uses Python identifier completed
+    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
 
     
-    end_date = property(__end_date.value, __end_date.set, None, None)
+    completed = property(__completed.value, __completed.set, None, None)
 
     
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
     # Element {http://kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
 
     
     start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
+
     
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    status = property(__status.value, __status.set, None, None)
+
+    
+    # Element {http://kolab.org}due-date uses Python identifier due_date
+    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
+
+    
+    due_date = property(__due_date.value, __due_date.set, None, None)
+
     
     # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+    
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = Incidence._ElementMap.copy()
     _ElementMap.update({
-        __show_time_as.name() : __show_time_as,
-        __color_label.name() : __color_label,
-        __end_date.name() : __end_date,
-        __start_date.name() : __start_date
+        __priority.name() : __priority,
+        __parent.name() : __parent,
+        __completed.name() : __completed,
+        __start_date.name() : __start_date,
+        __status.name() : __status,
+        __due_date.name() : __due_date
     })
     _AttributeMap = Incidence._AttributeMap.copy()
     _AttributeMap.update({
         
     })
-Namespace.addCategoryObject('typeBinding', u'Event', Event)
+Namespace.addCategoryObject('typeBinding', u'Task', Task)
 
 
 # Complex type Contact with content type ELEMENT_ONLY
@@ -627,12 +840,7 @@ class Contact (XMLBase):
     picture = property(__picture.value, __picture.set, None, None)
 
     
-    # Element {http://kolab.org}name uses Python identifier name
-    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
-
-    
-    name = property(__name.value, __name.set, None, None)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}children uses Python identifier children
     __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
@@ -648,7 +856,12 @@ class Contact (XMLBase):
     organization = property(__organization.value, __organization.set, None, None)
 
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
+    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
+
+    
+    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
+
     
     # Element {http://kolab.org}gender uses Python identifier gender
     __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
@@ -684,7 +897,12 @@ class Contact (XMLBase):
     email = property(__email.value, __email.set, None, None)
 
     
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}name uses Python identifier name
+    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
+
+    
+    name = property(__name.value, __name.set, None, None)
+
     
     # Element {http://kolab.org}department uses Python identifier department
     __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
@@ -765,12 +983,7 @@ class Contact (XMLBase):
     
     # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
-    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
-
-    
-    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
-
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}nick-name uses Python identifier nick_name
     __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
@@ -788,13 +1001,14 @@ class Contact (XMLBase):
         __birthday.name() : __birthday,
         __anniversary.name() : __anniversary,
         __picture.name() : __picture,
-        __name.name() : __name,
         __children.name() : __children,
         __organization.name() : __organization,
+        __free_busy_url.name() : __free_busy_url,
         __gender.name() : __gender,
         __language.name() : __language,
         __phone.name() : __phone,
         __email.name() : __email,
+        __name.name() : __name,
         __department.name() : __department,
         __address.name() : __address,
         __office_location.name() : __office_location,
@@ -806,235 +1020,44 @@ class Contact (XMLBase):
         __longitude.name() : __longitude,
         __manager_name.name() : __manager_name,
         __assistant.name() : __assistant,
-        __free_busy_url.name() : __free_busy_url,
         __nick_name.name() : __nick_name
     })
-    _AttributeMap = XMLBase._AttributeMap.copy()
-    _AttributeMap.update({
-        
-    })
-Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
-
-
-# Complex type Name with content type ELEMENT_ONLY
-class Name (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Element {http://kolab.org}middle-names uses Python identifier middle_names
-    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
-
-    
-    middle_names = property(__middle_names.value, __middle_names.set, None, None)
-
-    
-    # Element {http://kolab.org}given-name uses Python identifier given_name
-    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
-
-    
-    given_name = property(__given_name.value, __given_name.set, None, None)
-
-    
-    # Element {http://kolab.org}last-name uses Python identifier last_name
-    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
-
-    
-    last_name = property(__last_name.value, __last_name.set, None, None)
-
-    
-    # Element {http://kolab.org}full-name uses Python identifier full_name
-    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
-
-    
-    full_name = property(__full_name.value, __full_name.set, None, None)
-
-    
-    # Element {http://kolab.org}suffix uses Python identifier suffix
-    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
-
-    
-    suffix = property(__suffix.value, __suffix.set, None, None)
-
-    
-    # Element {http://kolab.org}initials uses Python identifier initials
-    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
-
-    
-    initials = property(__initials.value, __initials.set, None, None)
-
-    
-    # Element {http://kolab.org}prefix uses Python identifier prefix
-    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
-
-    
-    prefix = property(__prefix.value, __prefix.set, None, None)
-
-
-    _ElementMap = {
-        __middle_names.name() : __middle_names,
-        __given_name.name() : __given_name,
-        __last_name.name() : __last_name,
-        __full_name.name() : __full_name,
-        __suffix.name() : __suffix,
-        __initials.name() : __initials,
-        __prefix.name() : __prefix
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Name', Name)
-
-
-# Complex type Recurrence with content type ELEMENT_ONLY
-class Recurrence (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Element {http://kolab.org}rangetype uses Python identifier rangetype
-    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
-
-    
-    rangetype = property(__rangetype.value, __rangetype.set, None, None)
-
-    
-    # Element {http://kolab.org}interval uses Python identifier interval
-    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
-
-    
-    interval = property(__interval.value, __interval.set, None, None)
-
-    
-    # Element {http://kolab.org}exclusion uses Python identifier exclusion
-    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
-
-    
-    exclusion = property(__exclusion.value, __exclusion.set, None, None)
-
-
-    _ElementMap = {
-        __rangetype.name() : __rangetype,
-        __interval.name() : __interval,
-        __exclusion.name() : __exclusion
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
-
-
-# Complex type DailyRecurrence with content type ELEMENT_ONLY
-class DailyRecurrence (Recurrence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
-    # Base type is Recurrence
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-    
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-    
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-    
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
-    
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
-
-
-# Complex type SMTPContact with content type ELEMENT_ONLY
-class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Element {http://kolab.org}display-name uses Python identifier display_name
-    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
-
-    
-    display_name = property(__display_name.value, __display_name.set, None, None)
-
-    
-    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
-    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
-
-    
-    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
-
-
-    _ElementMap = {
-        __display_name.name() : __display_name,
-        __smtp_address.name() : __smtp_address
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
-
-
-# Complex type Attendee with content type ELEMENT_ONLY
-class Attendee (SMTPContact):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Attendee')
-    # Base type is SMTPContact
-    
-    # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
-    
-    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
-    
-    # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Attendee_httpkolab_orgstatus', False)
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
 
-    
-    status = property(__status.value, __status.set, None, None)
 
+# Complex type DailyRecurrence with content type ELEMENT_ONLY
+class DailyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    # Base type is Recurrence
     
-    # Element {http://kolab.org}role uses Python identifier role
-    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_Attendee_httpkolab_orgrole', False)
-
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    role = property(__role.value, __role.set, None, None)
-
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    # Element {http://kolab.org}request-response uses Python identifier request_response
-    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_Attendee_httpkolab_orgrequest_response', False)
-
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    request_response = property(__request_response.value, __request_response.set, None, None)
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
 
-    _ElementMap = SMTPContact._ElementMap.copy()
+    _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __status.name() : __status,
-        __role.name() : __role,
-        __request_response.name() : __request_response
+        
     })
-    _AttributeMap = SMTPContact._AttributeMap.copy()
+    _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
-        
+        __cycle.name() : __cycle
     })
-Namespace.addCategoryObject('typeBinding', u'Attendee', Attendee)
+Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
 
 
 # Complex type Note with content type ELEMENT_ONLY
@@ -1052,31 +1075,27 @@ class Note (XMLBase):
     background_color = property(__background_color.value, __background_color.set, None, None)
 
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-    
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-    
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
-    
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
     # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
-    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False, defaultValue=u'#ffff00')
+    # Element {http://kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
 
     
-    foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
+    summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element {http://kolab.org}summary uses Python identifier summary
-    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
+    # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
+    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False, defaultValue=u'#ffff00')
 
     
-    summary = property(__summary.value, __summary.set, None, None)
+    foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
 
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
     # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
@@ -1084,13 +1103,17 @@ class Note (XMLBase):
     
     # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
         __background_color.name() : __background_color,
-        __foreground_color.name() : __foreground_color,
-        __summary.name() : __summary
+        __summary.name() : __summary,
+        __foreground_color.name() : __foreground_color
     })
     _AttributeMap = XMLBase._AttributeMap.copy()
     _AttributeMap.update({
@@ -1099,29 +1122,6 @@ class Note (XMLBase):
 Namespace.addCategoryObject('typeBinding', u'Note', Note)
 
 
-# Complex type RecurrenceType with content type EMPTY
-class RecurrenceType (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'RecurrenceType')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_RecurrenceType_type', pyxb.binding.datatypes.string)
-    
-    type = property(__type.value, __type.set, None, None)
-
-
-    _ElementMap = {
-        
-    }
-    _AttributeMap = {
-        __type.name() : __type
-    }
-Namespace.addCategoryObject('typeBinding', u'RecurrenceType', RecurrenceType)
-
-
 # Complex type WeeklyRecurrence with content type ELEMENT_ONLY
 class WeeklyRecurrence (Recurrence):
     _TypeDefinition = None
@@ -1161,9 +1161,7 @@ class MonthlyRecurrence (Recurrence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
     # Base type is Recurrence
     
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
     # Element {http://kolab.org}day uses Python identifier day
     __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgday', False)
@@ -1172,7 +1170,9 @@ class MonthlyRecurrence (Recurrence):
     day = property(__day.value, __day.set, None, None)
 
     
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+    
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
     # Element {http://kolab.org}daynumber uses Python identifier daynumber
     __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
@@ -1267,12 +1267,12 @@ class YearlyRecurrence (Recurrence):
 Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
 
 
-task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
-Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
-
 event = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'event'), Event)
 Namespace.addCategoryObject('elementBinding', event.name().localName(), event)
 
+task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
+Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
+
 contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
 Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
 
@@ -1292,90 +1292,231 @@ PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._Grou
 
 
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
+    )
+SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
+Address._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=0L, max_occurs=1)
+    )
+Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
+XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
+    )
+XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), Recurrence, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), Attendee, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
+Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
+    )
+Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
+    )
+Event._GroupModel_3 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._GroupModel_2, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._GroupModel_3, min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_4 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'show-time-as')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'color-label')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'end-date')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._GroupModel_4, min_occurs=1, max_occurs=1)
+    )
+Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_occurs=1, max_occurs=1)
+
+
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Attendee))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=Attendee))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=Attendee))
+Attendee._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
+    )
+Attendee._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+    )
+Attendee._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Attendee._ContentModel = pyxb.binding.content.ParticleModel(Attendee._GroupModel, min_occurs=1, max_occurs=1)
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
-XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
-    )
-XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel, min_occurs=1, max_occurs=1)
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
 
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
 
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
+Name._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=0L, max_occurs=1)
+    )
+Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), Recurrence, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), Attendee, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), RecurrenceType, scope=Recurrence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
-Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
-    )
-Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Incidence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
     )
-Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
+Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
 
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
 
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
 
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
 Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
@@ -1416,74 +1557,6 @@ Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_oc
 
 
 
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
-Address._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=0L, max_occurs=1)
-    )
-Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
-Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
-    )
-Event._GroupModel_3 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Event._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._GroupModel_2, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._GroupModel_3, min_occurs=1, max_occurs=1)
-    )
-Event._GroupModel_4 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'show-time-as')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'color-label')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'end-date')), min_occurs=1, max_occurs=1)
-    )
-Event._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._GroupModel_4, min_occurs=1, max_occurs=1)
-    )
-Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
@@ -1494,12 +1567,12 @@ Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Names
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
-
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
@@ -1508,6 +1581,8 @@ Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Names
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
+
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
@@ -1530,8 +1605,6 @@ Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Names
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
-
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
 Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
@@ -1578,46 +1651,6 @@ Contact._GroupModel = pyxb.binding.content.GroupSequence(
 Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
 
 
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
-Name._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=0L, max_occurs=1)
-    )
-Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), RecurrenceType, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
-Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
-    )
-Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
 DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
@@ -1627,44 +1660,11 @@ DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurren
 
 
 
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
-
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
-SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
-    )
-SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Attendee))
-
-Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=Attendee))
-
-Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=Attendee))
-Attendee._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
-    )
-Attendee._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
-    )
-Attendee._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Attendee._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Attendee._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-Attendee._ContentModel = pyxb.binding.content.ParticleModel(Attendee._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
 
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
-
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
 Note._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),


commit c0e4bb9bccd0d17526e168604f8a489a5e34d78b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 11:58:44 2011 +0100

    Add our Contact() wrapper

diff --git a/pykolab/contact.py b/pykolab/contact.py
new file mode 100644
index 0000000..c4611fe
--- /dev/null
+++ b/pykolab/contact.py
@@ -0,0 +1,31 @@
+import datetime
+import pykolab.format
+
+class Contact(pykolab.format.Contact):
+    def __init__(self, *args, **kw):
+        if kw.has_key('email'):
+            if isinstance(kw['email'], pykolab.format.SMTPContact):
+                kw['email'] = [ kw['email'] ]
+            elif isinstance(kw['email'], basestring):
+                kw['email'] = [ pykolab.format.SMTPContact(kw['email']) ]
+
+        pykolab.format.Contact.__init__(self, *args, **kw)
+
+        self.uid = pykolab.format.UID("0123456789")
+        self.product_id = "PyKolab Format XML Bindings"
+
+    def set_name(self, given_name=None, middle_names=None, last_name=None, full_name=None, initials=None, prefix=None, suffix=None):
+        self.name = pykolab.format.Name(given_name, middle_names, last_name, full_name, initials, prefix, suffix)
+
+    def set_email(self, smtp_address, display_name=None):
+        self.email = [ pykolab.format.SMTPContact(smtp_address, display_name) ]
+
+    def add_email(self, smtp_address, display_name=None):
+        self.email.append(pykolab.format.SMTPContact(smtp_address, display_name))
+
+    def toxml(self):
+        if not hasattr(self,'creation_date') or self.creation_date == None:
+            self.creation_date = datetime.datetime.now()
+
+        self.last_modification_date = datetime.datetime.now()
+        return pykolab.format.Contact.toxml(self)
\ No newline at end of file


commit 42b34375fe5e2d68a6ce8ba25ee31e2a80fd0090
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 11:58:22 2011 +0100

    Add tests for Contact objects

diff --git a/tests/test-contact.py b/tests/test-contact.py
new file mode 100644
index 0000000..e0196bc
--- /dev/null
+++ b/tests/test-contact.py
@@ -0,0 +1,102 @@
+import pyxb
+
+import sys
+import unittest
+
+from pykolab.contact import Contact
+
+from pykolab.format import Name
+from pykolab.format import SMTPContact
+from pykolab.format import UID
+
+class TestContact(unittest.TestCase):
+    """
+        Test creating / writing a contact
+    """
+    def testContactCreate(self):
+        mycontact = Contact()
+
+        # Test creation
+        self.assertTrue(isinstance(mycontact, Contact))
+
+        # Test values set (or not set) in __init__
+        self.assertFalse(isinstance(mycontact.name, Name))
+        self.assertTrue(isinstance(mycontact.email, list))
+        self.assertEqual(0, len(mycontact.email))
+        self.assertTrue(isinstance(mycontact.uid, UID))
+        self.assertTrue(isinstance(mycontact.product_id, basestring))
+
+        # Test functions callable
+        self.assertTrue(callable(mycontact.set_name))
+        self.assertTrue(callable(mycontact.set_email))
+        self.assertTrue(callable(mycontact.add_email))
+        self.assertTrue(callable(mycontact.toxml))
+
+    def testContactMinimal(self):
+        mycontact = Contact(
+                email="vanmeeuwen at kolabsys.com"
+            )
+
+        # Test creation
+        self.assertTrue(isinstance(mycontact, Contact))
+        self.assertTrue(isinstance(mycontact.email, list))
+        self.assertEqual(1, len(mycontact.email))
+        self.assertTrue(isinstance(mycontact.email[0], SMTPContact))
+        self.assertEqual("vanmeeuwen at kolabsys.com", mycontact.email[0].smtp_address)
+        self.assertEqual(None, mycontact.email[0].display_name)
+
+    def testContactCreateWithDetailsStringEmail(self):
+        mycontact = Contact(
+                email="vanmeeuwen at kolabsys.com"
+            )
+        self.assertTrue(isinstance(mycontact, Contact))
+        self.assertTrue(isinstance(mycontact.email, list))
+        self.assertEqual(1, len(mycontact.email))
+        self.assertTrue(isinstance(mycontact.email[0], SMTPContact))
+        self.assertEqual("vanmeeuwen at kolabsys.com", mycontact.email[0].smtp_address)
+        self.assertEqual(None, mycontact.email[0].display_name)
+
+    def testContactCreateWithDetailsSMTPContactEmailNoList(self):
+        mycontact = Contact(
+                name=Name("Jeroen", last_name="van Meeuwen"),
+                email=SMTPContact("vanmeeuwen at kolabsys.com")
+            )
+
+        # See if creation was successful
+        self.assertTrue(isinstance(mycontact, Contact))
+        # See if the smtp contact (address) got appended to the email attribute
+        self.assertTrue(isinstance(mycontact.email, list))
+        # There should be exactly one value in mycontact.email now
+        self.assertEqual(1, len(mycontact.email))
+        # And it should be an SMTPContact instance
+        self.assertTrue(isinstance(mycontact.email[0], SMTPContact))
+        # And SMTPContact being what it is, ...
+        self.assertEqual("vanmeeuwen at kolabsys.com", mycontact.email[0].smtp_address)
+        self.assertEqual(None, mycontact.email[0].display_name)
+
+        # Also see if the name property has been set correctly
+        self.assertTrue(isinstance(mycontact.name, Name))
+        self.assertEqual("Jeroen", mycontact.name.given_name)
+        self.assertEqual("van Meeuwen", mycontact.name.last_name)
+
+    def testContactCreateWithDetailsSMTPContactEmailList(self):
+        mycontact = Contact(
+                name=Name("Jeroen", last_name="van Meeuwen"),
+                email=[SMTPContact("vanmeeuwen at kolabsys.com", "Jeroen van Meeuwen (Kolab Systems)")]
+            )
+
+        # Test creation
+        self.assertTrue(isinstance(mycontact, Contact))
+        self.assertTrue(isinstance(mycontact.email, list))
+        self.assertEqual(1, len(mycontact.email))
+        self.assertTrue(isinstance(mycontact.email[0], SMTPContact))
+        self.assertEqual("vanmeeuwen at kolabsys.com", mycontact.email[0].smtp_address)
+        self.assertEqual("Jeroen van Meeuwen (Kolab Systems)", mycontact.email[0].display_name)
+
+        # Also see if the name property has been set correctly
+        self.assertTrue(isinstance(mycontact.name, Name))
+        self.assertEqual("Jeroen", mycontact.name.given_name)
+        self.assertEqual("van Meeuwen", mycontact.name.last_name)
+
+if __name__ == '__main__':
+    unittest.main()


commit c264feee7deaba824821bdf31c1524d85324ff3a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 11:28:53 2011 +0100

    Add tests

diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..d03e763
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+
+import sys
+
+sys.path.append('.')
+
+# Corrects Namespace handling
+from pykolab.format import *
diff --git a/tests/test-default-value-sensitivity.py b/tests/test-default-value-sensitivity.py
new file mode 100644
index 0000000..6292a14
--- /dev/null
+++ b/tests/test-default-value-sensitivity.py
@@ -0,0 +1,33 @@
+import pyxb
+from pyxb.exceptions_ import *
+
+import sys
+import unittest
+
+from pykolab.format import Contact
+from pykolab.format import Event
+from pykolab.format import Note
+from pykolab.format import Task
+
+class TestDefaultValueSensitivity(unittest.TestCase):
+    """
+        Test whether the default value for sensitivity is set on creation.
+    """
+    def testContact(self):
+        mycontact = Contact()
+        self.assertEqual(mycontact.sensitivity, u'public')
+
+    def testEvent(self):
+        myevent = Event()
+        self.assertEqual(myevent.sensitivity, u'public')
+
+    def testNote(self):
+        mynote = Note()
+        self.assertEqual(mynote.sensitivity, u'public')
+
+    def testTask(self):
+        mytask = Task()
+        self.assertEqual(mytask.sensitivity, u'public')
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/test-sensitivity-value.py b/tests/test-sensitivity-value.py
new file mode 100644
index 0000000..b911ba8
--- /dev/null
+++ b/tests/test-sensitivity-value.py
@@ -0,0 +1,41 @@
+import pyxb
+
+import sys
+import unittest
+
+from pykolab.format import Contact
+from pykolab.format import Event
+from pykolab.format import Note
+from pykolab.format import Task
+
+from pykolab.raw.format import Sensitivity
+
+class TestSensitivityValue(unittest.TestCase):
+    """
+        Test values for sensitivity
+    """
+    def testSensitivityBase(self):
+        self.assertRaises(pyxb.exceptions_.BadTypeValueError, lambda: Sensitivity())
+
+    def testSensitivityCreatePublic(self):
+        mysensitivity = Sensitivity(u'public')
+        self.assertEqual(mysensitivity.__str__(), u'public')
+
+    def testSensitivityCreatePrivate(self):
+        mysensitivity = Sensitivity(u'private')
+        self.assertNotEqual(mysensitivity.__str__(), u'public')
+        self.assertEqual(mysensitivity.__str__(), u'private')
+
+    def testSensitivityAttrs(self):
+        mysensitivity = Sensitivity(u'confidential')
+        self.assertEqual(mysensitivity.public, u'public')
+        self.assertEqual(mysensitivity.private, u'private')
+        self.assertEqual(mysensitivity.confidential, u'confidential')
+
+    def testSensitivityInvalidAttrs(self):
+        mysensitivity = Sensitivity(u'confidential')
+        # Test for invalid values
+        self.assertRaises(AttributeError, lambda: mysensitivity.nosuchvalue)
+
+if __name__ == '__main__':
+    unittest.main()


commit 1a6a2256076c6fe3b9b3cae17b95a241a1a15512
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Oct 25 11:28:42 2011 +0100

    Add a test make target

diff --git a/Makefile.am b/Makefile.am
index a48fcd1..9e42094 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,9 @@ tarball:
 	git stash
 	make dist
 
+test:
+	@nosetests -v -d tests/
+
 ChangeLog:
 	(GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 


commit 1133610d8ed086edfb3636b4efe5ea480b8e4ee5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:43:14 2011 +0100

    Generate Python bindings based on the latest version of the XML Schema Definitions

diff --git a/pykolab/raw/format.py b/pykolab/raw/format.py
index 29d9605..ac47798 100644
--- a/pykolab/raw/format.py
+++ b/pykolab/raw/format.py
@@ -1,7 +1,7 @@
 # ./pykolab/raw/format.py
 # PyXB bindings for NamespaceModule
 # NSM:627e20d8ff2455aff19af8f568d2295daed9a405
-# Generated 2011-10-23 17:40:55.068585 by PyXB version 1.1.2
+# Generated 2011-10-23 17:43:09.571445 by PyXB version 1.1.2
 import pyxb
 import pyxb.binding
 import pyxb.binding.saxer
@@ -11,7 +11,7 @@ import pyxb.utils.domutils
 import sys
 
 # Unique identifier for bindings created at the same time
-_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:c6ae55ec-fd95-11e0-90b8-001f3c5996b7')
+_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:16db1f1e-fd96-11e0-ad63-001f3c5996b7')
 
 # Import bindings for namespaces imported into schema
 import pyxb.binding.datatypes
@@ -57,17 +57,31 @@ Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
 Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
 
 # Atomic SimpleTypeDefinition
-class STD_ANON (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class Category (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
+    _Documentation = None
+Category._CF_pattern = pyxb.binding.facets.CF_pattern()
+Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
+Category._InitializeFacetMap(Category._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Category', Category)
+
+# Atomic SimpleTypeDefinition
+class Cycle (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
 
     """An atomic simple type."""
 
-    _ExpandedName = None
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Cycle')
     _Documentation = None
-STD_ANON._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=STD_ANON, enum_prefix=None)
-STD_ANON.monthday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'monthday')
-STD_ANON.yearday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'yearday')
-STD_ANON.weekday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'weekday')
-STD_ANON._InitializeFacetMap(STD_ANON._CF_enumeration)
+Cycle._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Cycle, enum_prefix=None)
+Cycle.daily = Cycle._CF_enumeration.addEnumeration(unicode_value=u'daily')
+Cycle.weekly = Cycle._CF_enumeration.addEnumeration(unicode_value=u'weekly')
+Cycle.monthly = Cycle._CF_enumeration.addEnumeration(unicode_value=u'monthly')
+Cycle.yearly = Cycle._CF_enumeration.addEnumeration(unicode_value=u'yearly')
+Cycle._InitializeFacetMap(Cycle._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'Cycle', Cycle)
 
 # Atomic SimpleTypeDefinition
 class Color (pyxb.binding.datatypes.string):
@@ -76,52 +90,57 @@ class Color (pyxb.binding.datatypes.string):
 
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
     _Documentation = None
-Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
 Color._CF_pattern = pyxb.binding.facets.CF_pattern()
 Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
-Color._InitializeFacetMap(Color._CF_length,
-   Color._CF_pattern)
+Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
+Color._InitializeFacetMap(Color._CF_pattern,
+   Color._CF_length)
 Namespace.addCategoryObject('typeBinding', u'Color', Color)
 
 # Atomic SimpleTypeDefinition
-class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class UID (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
     _Documentation = None
-NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
-NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
-NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
-NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
-NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
-NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
+UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
+UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
+UID._InitializeFacetMap(UID._CF_minLength,
+   UID._CF_whiteSpace)
+Namespace.addCategoryObject('typeBinding', u'UID', UID)
 
-# Atomic SimpleTypeDefinition
-class Category (pyxb.binding.datatypes.string):
+# Complex type PhoneNumber with content type ELEMENT_ONLY
+class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {http://kolab.org}number uses Python identifier number
+    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
 
-    """An atomic simple type."""
+    
+    number = property(__number.value, __number.set, None, None)
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
-    _Documentation = None
-Category._CF_pattern = pyxb.binding.facets.CF_pattern()
-Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
-Category._InitializeFacetMap(Category._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Category', Category)
+    
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
 
-# Atomic SimpleTypeDefinition
-class UID (pyxb.binding.datatypes.string):
+    
+    type = property(__type.value, __type.set, None, None)
 
-    """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
-    _Documentation = None
-UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
-UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
-UID._InitializeFacetMap(UID._CF_whiteSpace,
-   UID._CF_minLength)
-Namespace.addCategoryObject('typeBinding', u'UID', UID)
+    _ElementMap = {
+        __number.name() : __number,
+        __type.name() : __type
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
+
 
 # Complex type XMLBase with content type ELEMENT_ONLY
 class XMLBase (pyxb.binding.basis.complexTypeDefinition):
@@ -138,18 +157,18 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
 
     
-    # Element {http://kolab.org}product-id uses Python identifier product_id
-    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
+    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
+    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
 
     
-    product_id = property(__product_id.value, __product_id.set, None, None)
+    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
 
     
-    # Element {http://kolab.org}body uses Python identifier body
-    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
+    # Element {http://kolab.org}categories uses Python identifier categories
+    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
 
     
-    body = property(__body.value, __body.set, None, None)
+    categories = property(__categories.value, __categories.set, None, None)
 
     
     # Element {http://kolab.org}sensitivity uses Python identifier sensitivity
@@ -159,18 +178,18 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
 
     
-    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
-    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
+    # Element {http://kolab.org}body uses Python identifier body
+    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
 
     
-    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
+    body = property(__body.value, __body.set, None, None)
 
     
-    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
-    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
+    # Element {http://kolab.org}creation-date uses Python identifier creation_date
+    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
 
     
-    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+    creation_date = property(__creation_date.value, __creation_date.set, None, None)
 
     
     # Element {http://kolab.org}uid uses Python identifier uid
@@ -180,36 +199,36 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     uid = property(__uid.value, __uid.set, None, None)
 
     
-    # Element {http://kolab.org}creation-date uses Python identifier creation_date
-    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
+    # Element {http://kolab.org}product-id uses Python identifier product_id
+    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
 
     
-    creation_date = property(__creation_date.value, __creation_date.set, None, None)
+    product_id = property(__product_id.value, __product_id.set, None, None)
 
     
-    # Element {http://kolab.org}categories uses Python identifier categories
-    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
+    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
+    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
 
     
-    categories = property(__categories.value, __categories.set, None, None)
+    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
 
     
     # Attribute version uses Python identifier version
-    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.double, unicode_default=u'1.0')
+    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'3.0dev1')
     
     version = property(__version.value, __version.set, None, None)
 
 
     _ElementMap = {
         __link_attachment.name() : __link_attachment,
-        __product_id.name() : __product_id,
-        __body.name() : __body,
-        __sensitivity.name() : __sensitivity,
-        __last_modification_date.name() : __last_modification_date,
         __inline_attachment.name() : __inline_attachment,
-        __uid.name() : __uid,
+        __categories.name() : __categories,
+        __sensitivity.name() : __sensitivity,
+        __body.name() : __body,
         __creation_date.name() : __creation_date,
-        __categories.name() : __categories
+        __uid.name() : __uid,
+        __product_id.name() : __product_id,
+        __last_modification_date.name() : __last_modification_date
     }
     _AttributeMap = {
         __version.name() : __version
@@ -225,26 +244,11 @@ class Incidence (XMLBase):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
     # Base type is XMLBase
     
-    # Element {http://kolab.org}attendee uses Python identifier attendee
-    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
-
-    
-    attendee = property(__attendee.value, __attendee.set, None, None)
-
-    
-    # Element {http://kolab.org}location uses Python identifier location
-    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
-
-    
-    location = property(__location.value, __location.set, None, None)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}alarm uses Python identifier alarm
-    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    alarm = property(__alarm.value, __alarm.set, None, None)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
@@ -255,33 +259,50 @@ class Incidence (XMLBase):
     creator = property(__creator.value, __creator.set, None, None)
 
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}organizer uses Python identifier organizer
+    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
+
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    organizer = property(__organizer.value, __organizer.set, None, None)
+
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}recurrence uses Python identifier recurrence
+    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
+
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+
     
     # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    
     # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}organizer uses Python identifier organizer
-    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}attendee uses Python identifier attendee
+    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
 
     
-    organizer = property(__organizer.value, __organizer.set, None, None)
+    attendee = property(__attendee.value, __attendee.set, None, None)
 
     
-    # Element {http://kolab.org}recurrence uses Python identifier recurrence
-    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}alarm uses Python identifier alarm
+    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
 
     
-    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+    alarm = property(__alarm.value, __alarm.set, None, None)
 
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}location uses Python identifier location
+    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
+
+    
+    location = property(__location.value, __location.set, None, None)
+
     
     # Element {http://kolab.org}summary uses Python identifier summary
     __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Incidence_httpkolab_orgsummary', False)
@@ -290,18 +311,16 @@ class Incidence (XMLBase):
     summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-    
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
-        __attendee.name() : __attendee,
-        __location.name() : __location,
-        __alarm.name() : __alarm,
         __creator.name() : __creator,
         __organizer.name() : __organizer,
         __recurrence.name() : __recurrence,
+        __attendee.name() : __attendee,
+        __alarm.name() : __alarm,
+        __location.name() : __location,
         __summary.name() : __summary
     })
     _AttributeMap = XMLBase._AttributeMap.copy()
@@ -319,46 +338,37 @@ class Task (Incidence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
     # Base type is Incidence
     
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}completed uses Python identifier completed
-    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
 
     
-    completed = property(__completed.value, __completed.set, None, None)
+    status = property(__status.value, __status.set, None, None)
 
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-    
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-    
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
-    
     # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
+    # Element {http://kolab.org}parent uses Python identifier parent
+    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
 
     
-    status = property(__status.value, __status.set, None, None)
+    parent = property(__parent.value, __parent.set, None, None)
 
     
-    # Element {http://kolab.org}due-date uses Python identifier due_date
-    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    due_date = property(__due_date.value, __due_date.set, None, None)
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}start-date uses Python identifier start_date
     __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
@@ -367,41 +377,50 @@ class Task (Incidence):
     start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    # Element {http://kolab.org}parent uses Python identifier parent
-    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
+    # Element {http://kolab.org}completed uses Python identifier completed
+    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
 
     
-    parent = property(__parent.value, __parent.set, None, None)
+    completed = property(__completed.value, __completed.set, None, None)
 
     
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
     # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}priority uses Python identifier priority
-    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
-
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    priority = property(__priority.value, __priority.set, None, None)
+    # Element {http://kolab.org}due-date uses Python identifier due_date
+    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
 
     
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+    due_date = property(__due_date.value, __due_date.set, None, None)
+
     
     # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}priority uses Python identifier priority
+    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
+
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    priority = property(__priority.value, __priority.set, None, None)
+
+    
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
     
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = Incidence._ElementMap.copy()
     _ElementMap.update({
-        __completed.name() : __completed,
         __status.name() : __status,
-        __due_date.name() : __due_date,
-        __start_date.name() : __start_date,
         __parent.name() : __parent,
+        __start_date.name() : __start_date,
+        __completed.name() : __completed,
+        __due_date.name() : __due_date,
         __priority.name() : __priority
     })
     _AttributeMap = Incidence._AttributeMap.copy()
@@ -411,437 +430,340 @@ class Task (Incidence):
 Namespace.addCategoryObject('typeBinding', u'Task', Task)
 
 
-# Complex type Name with content type ELEMENT_ONLY
-class Name (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Address with content type ELEMENT_ONLY
+class Address (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}last-name uses Python identifier last_name
-    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
-
-    
-    last_name = property(__last_name.value, __last_name.set, None, None)
-
-    
-    # Element {http://kolab.org}initials uses Python identifier initials
-    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
+    # Element {http://kolab.org}street uses Python identifier street
+    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
 
     
-    initials = property(__initials.value, __initials.set, None, None)
+    street = property(__street.value, __street.set, None, None)
 
     
-    # Element {http://kolab.org}full-name uses Python identifier full_name
-    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
+    # Element {http://kolab.org}country uses Python identifier country
+    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
 
     
-    full_name = property(__full_name.value, __full_name.set, None, None)
+    country = property(__country.value, __country.set, None, None)
 
     
-    # Element {http://kolab.org}given-name uses Python identifier given_name
-    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
+    # Element {http://kolab.org}postal-code uses Python identifier postal_code
+    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
 
     
-    given_name = property(__given_name.value, __given_name.set, None, None)
+    postal_code = property(__postal_code.value, __postal_code.set, None, None)
 
     
-    # Element {http://kolab.org}prefix uses Python identifier prefix
-    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
+    # Element {http://kolab.org}locality uses Python identifier locality
+    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
 
     
-    prefix = property(__prefix.value, __prefix.set, None, None)
+    locality = property(__locality.value, __locality.set, None, None)
 
     
-    # Element {http://kolab.org}middle-names uses Python identifier middle_names
-    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
 
     
-    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+    type = property(__type.value, __type.set, None, None)
 
     
-    # Element {http://kolab.org}suffix uses Python identifier suffix
-    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
+    # Element {http://kolab.org}region uses Python identifier region
+    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
 
     
-    suffix = property(__suffix.value, __suffix.set, None, None)
+    region = property(__region.value, __region.set, None, None)
 
 
     _ElementMap = {
-        __last_name.name() : __last_name,
-        __initials.name() : __initials,
-        __full_name.name() : __full_name,
-        __given_name.name() : __given_name,
-        __prefix.name() : __prefix,
-        __middle_names.name() : __middle_names,
-        __suffix.name() : __suffix
+        __street.name() : __street,
+        __country.name() : __country,
+        __postal_code.name() : __postal_code,
+        __locality.name() : __locality,
+        __type.name() : __type,
+        __region.name() : __region
     }
     _AttributeMap = {
         
     }
-Namespace.addCategoryObject('typeBinding', u'Name', Name)
+Namespace.addCategoryObject('typeBinding', u'Address', Address)
 
 
-# Complex type SMTPContact with content type ELEMENT_ONLY
-class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Event with content type ELEMENT_ONLY
+class Event (Incidence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
-    # Base type is pyxb.binding.datatypes.anyType
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
+    # Base type is Incidence
     
-    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
-    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
+    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
+    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
 
     
-    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
 
     
-    # Element {http://kolab.org}display-name uses Python identifier display_name
-    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    display_name = property(__display_name.value, __display_name.set, None, None)
-
-
-    _ElementMap = {
-        __smtp_address.name() : __smtp_address,
-        __display_name.name() : __display_name
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
-
-
-# Complex type Address with content type ELEMENT_ONLY
-class Address (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
-    # Base type is pyxb.binding.datatypes.anyType
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}locality uses Python identifier locality
-    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
-
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    locality = property(__locality.value, __locality.set, None, None)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}region uses Python identifier region
-    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    region = property(__region.value, __region.set, None, None)
+    # Element {http://kolab.org}color-label uses Python identifier color_label
+    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
 
     
-    # Element {http://kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
+    color_label = property(__color_label.value, __color_label.set, None, None)
 
     
-    type = property(__type.value, __type.set, None, None)
-
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}postal-code uses Python identifier postal_code
-    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
-
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
-    postal_code = property(__postal_code.value, __postal_code.set, None, None)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}street uses Python identifier street
-    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
-
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    street = property(__street.value, __street.set, None, None)
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}country uses Python identifier country
-    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
-
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    country = property(__country.value, __country.set, None, None)
-
-
-    _ElementMap = {
-        __locality.name() : __locality,
-        __region.name() : __region,
-        __type.name() : __type,
-        __postal_code.name() : __postal_code,
-        __street.name() : __street,
-        __country.name() : __country
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Address', Address)
-
+    # Element {http://kolab.org}end-date uses Python identifier end_date
+    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
 
-# Complex type Recurrence with content type ELEMENT_ONLY
-class Recurrence (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}interval uses Python identifier interval
-    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
+    end_date = property(__end_date.value, __end_date.set, None, None)
 
     
-    interval = property(__interval.value, __interval.set, None, None)
-
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}exclusion uses Python identifier exclusion
-    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
-
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
 
     
-    # Element {http://kolab.org}rangetype uses Python identifier rangetype
-    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
+    start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    rangetype = property(__rangetype.value, __rangetype.set, None, None)
-
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+    
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    _ElementMap = {
-        __interval.name() : __interval,
-        __exclusion.name() : __exclusion,
-        __rangetype.name() : __rangetype
-    }
-    _AttributeMap = {
+    _ElementMap = Incidence._ElementMap.copy()
+    _ElementMap.update({
+        __show_time_as.name() : __show_time_as,
+        __color_label.name() : __color_label,
+        __end_date.name() : __end_date,
+        __start_date.name() : __start_date
+    })
+    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap.update({
         
-    }
-Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+    })
+Namespace.addCategoryObject('typeBinding', u'Event', Event)
 
 
-# Complex type YearlyRecurrence with content type ELEMENT_ONLY
-class YearlyRecurrence (Recurrence):
+# Complex type Contact with content type ELEMENT_ONLY
+class Contact (XMLBase):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
-    # Base type is Recurrence
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    # Base type is XMLBase
     
-    # Element {http://kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
+    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
+    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
 
     
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
 
     
-    # Element {http://kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
+    # Element {http://kolab.org}im-address uses Python identifier im_address
+    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
 
     
-    day = property(__day.value, __day.set, None, None)
+    im_address = property(__im_address.value, __im_address.set, None, None)
 
     
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-    
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}month uses Python identifier month
-    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
+    # Element {http://kolab.org}birthday uses Python identifier birthday
+    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
 
     
-    month = property(__month.value, __month.set, None, None)
+    birthday = property(__birthday.value, __birthday.set, None, None)
 
     
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', STD_ANON, required=True)
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    type = property(__type.value, __type.set, None, None)
+    # Element {http://kolab.org}anniversary uses Python identifier anniversary
+    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
 
     
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
-    
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        __daynumber.name() : __daynumber,
-        __day.name() : __day,
-        __month.name() : __month
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __type.name() : __type,
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
-
+    anniversary = property(__anniversary.value, __anniversary.set, None, None)
 
-# Complex type Event with content type ELEMENT_ONLY
-class Event (Incidence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
-    # Base type is Incidence
     
-    # Element {http://kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    start_date = property(__start_date.value, __start_date.set, None, None)
+    # Element {http://kolab.org}picture uses Python identifier picture
+    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
 
     
-    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
-    
-    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
+    picture = property(__picture.value, __picture.set, None, None)
+
     
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}name uses Python identifier name
+    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
+
     
-    # Element {http://kolab.org}end-date uses Python identifier end_date
-    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
+    name = property(__name.value, __name.set, None, None)
 
     
-    end_date = property(__end_date.value, __end_date.set, None, None)
+    # Element {http://kolab.org}children uses Python identifier children
+    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
 
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    children = property(__children.value, __children.set, None, None)
+
     
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}organization uses Python identifier organization
+    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
+
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    organization = property(__organization.value, __organization.set, None, None)
+
     
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
-    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
+    # Element {http://kolab.org}gender uses Python identifier gender
+    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
 
     
-    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
+    gender = property(__gender.value, __gender.set, None, None)
 
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-    
     # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}language uses Python identifier language
+    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
+
     
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    language = property(__language.value, __language.set, None, None)
+
     
-    # Element {http://kolab.org}color-label uses Python identifier color_label
-    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}phone uses Python identifier phone
+    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
 
     
-    color_label = property(__color_label.value, __color_label.set, None, None)
+    phone = property(__phone.value, __phone.set, None, None)
 
     
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}email uses Python identifier email
+    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
+
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    email = property(__email.value, __email.set, None, None)
+
     
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-    
-    # Attribute version inherited from {http://kolab.org}XMLBase
-
-    _ElementMap = Incidence._ElementMap.copy()
-    _ElementMap.update({
-        __start_date.name() : __start_date,
-        __end_date.name() : __end_date,
-        __show_time_as.name() : __show_time_as,
-        __color_label.name() : __color_label
-    })
-    _AttributeMap = Incidence._AttributeMap.copy()
-    _AttributeMap.update({
-        
-    })
-Namespace.addCategoryObject('typeBinding', u'Event', Event)
-
+    # Element {http://kolab.org}department uses Python identifier department
+    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
 
-# Complex type Contact with content type ELEMENT_ONLY
-class Contact (XMLBase):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
-    # Base type is XMLBase
     
-    # Element {http://kolab.org}manager-name uses Python identifier manager_name
-    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
+    department = property(__department.value, __department.set, None, None)
 
     
-    manager_name = property(__manager_name.value, __manager_name.set, None, None)
+    # Element {http://kolab.org}address uses Python identifier address
+    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
 
     
-    # Element {http://kolab.org}assistant uses Python identifier assistant
-    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
+    address = property(__address.value, __address.set, None, None)
 
     
-    assistant = property(__assistant.value, __assistant.set, None, None)
+    # Element {http://kolab.org}office-location uses Python identifier office_location
+    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
 
     
-    # Element {http://kolab.org}anniversary uses Python identifier anniversary
-    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
+    office_location = property(__office_location.value, __office_location.set, None, None)
 
     
-    anniversary = property(__anniversary.value, __anniversary.set, None, None)
+    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
+    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
 
     
-    # Element {http://kolab.org}nick-name uses Python identifier nick_name
-    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
+    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
 
     
-    nick_name = property(__nick_name.value, __nick_name.set, None, None)
+    # Element {http://kolab.org}web-page uses Python identifier web_page
+    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
 
     
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    web_page = property(__web_page.value, __web_page.set, None, None)
+
     
-    # Element {http://kolab.org}gender uses Python identifier gender
-    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
+    # Element {http://kolab.org}profession uses Python identifier profession
+    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
 
     
-    gender = property(__gender.value, __gender.set, None, None)
+    profession = property(__profession.value, __profession.set, None, None)
 
     
-    # Element {http://kolab.org}birthday uses Python identifier birthday
-    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
+    # Element {http://kolab.org}latitude uses Python identifier latitude
+    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
 
     
-    birthday = property(__birthday.value, __birthday.set, None, None)
+    latitude = property(__latitude.value, __latitude.set, None, None)
 
     
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}job-title uses Python identifier job_title
+    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
+
     
-    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
-    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
+    job_title = property(__job_title.value, __job_title.set, None, None)
 
     
-    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
+    # Element {http://kolab.org}longitude uses Python identifier longitude
+    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
 
     
-    # Element {http://kolab.org}picture uses Python identifier picture
-    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
+    longitude = property(__longitude.value, __longitude.set, None, None)
 
     
-    picture = property(__picture.value, __picture.set, None, None)
+    # Element {http://kolab.org}manager-name uses Python identifier manager_name
+    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
 
     
-    # Element {http://kolab.org}name uses Python identifier name
-    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
+    manager_name = property(__manager_name.value, __manager_name.set, None, None)
 
     
-    name = property(__name.value, __name.set, None, None)
+    # Element {http://kolab.org}assistant uses Python identifier assistant
+    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
 
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    assistant = property(__assistant.value, __assistant.set, None, None)
+
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
     __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
@@ -850,186 +772,253 @@ class Contact (XMLBase):
     free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
 
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-    
-    # Element {http://kolab.org}organization uses Python identifier organization
-    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
+    # Element {http://kolab.org}nick-name uses Python identifier nick_name
+    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
 
     
-    organization = property(__organization.value, __organization.set, None, None)
+    nick_name = property(__nick_name.value, __nick_name.set, None, None)
 
     
-    # Element {http://kolab.org}language uses Python identifier language
-    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    
-    language = property(__language.value, __language.set, None, None)
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __spouse_name.name() : __spouse_name,
+        __im_address.name() : __im_address,
+        __birthday.name() : __birthday,
+        __anniversary.name() : __anniversary,
+        __picture.name() : __picture,
+        __name.name() : __name,
+        __children.name() : __children,
+        __organization.name() : __organization,
+        __gender.name() : __gender,
+        __language.name() : __language,
+        __phone.name() : __phone,
+        __email.name() : __email,
+        __department.name() : __department,
+        __address.name() : __address,
+        __office_location.name() : __office_location,
+        __preferred_address.name() : __preferred_address,
+        __web_page.name() : __web_page,
+        __profession.name() : __profession,
+        __latitude.name() : __latitude,
+        __job_title.name() : __job_title,
+        __longitude.name() : __longitude,
+        __manager_name.name() : __manager_name,
+        __assistant.name() : __assistant,
+        __free_busy_url.name() : __free_busy_url,
+        __nick_name.name() : __nick_name
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
 
-    
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-    
-    # Element {http://kolab.org}web-page uses Python identifier web_page
-    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
 
+# Complex type Name with content type ELEMENT_ONLY
+class Name (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    web_page = property(__web_page.value, __web_page.set, None, None)
+    # Element {http://kolab.org}middle-names uses Python identifier middle_names
+    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
 
     
-    # Element {http://kolab.org}phone uses Python identifier phone
-    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
+    middle_names = property(__middle_names.value, __middle_names.set, None, None)
 
     
-    phone = property(__phone.value, __phone.set, None, None)
+    # Element {http://kolab.org}given-name uses Python identifier given_name
+    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
 
     
-    # Element {http://kolab.org}job-title uses Python identifier job_title
-    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
+    given_name = property(__given_name.value, __given_name.set, None, None)
 
     
-    job_title = property(__job_title.value, __job_title.set, None, None)
+    # Element {http://kolab.org}last-name uses Python identifier last_name
+    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
 
     
-    # Element {http://kolab.org}im-address uses Python identifier im_address
-    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
+    last_name = property(__last_name.value, __last_name.set, None, None)
 
     
-    im_address = property(__im_address.value, __im_address.set, None, None)
+    # Element {http://kolab.org}full-name uses Python identifier full_name
+    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
 
     
-    # Element {http://kolab.org}email uses Python identifier email
-    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
+    full_name = property(__full_name.value, __full_name.set, None, None)
 
     
-    email = property(__email.value, __email.set, None, None)
+    # Element {http://kolab.org}suffix uses Python identifier suffix
+    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
 
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-    
-    # Element {http://kolab.org}department uses Python identifier department
-    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
+    suffix = property(__suffix.value, __suffix.set, None, None)
 
     
-    department = property(__department.value, __department.set, None, None)
+    # Element {http://kolab.org}initials uses Python identifier initials
+    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
 
     
-    # Element {http://kolab.org}address uses Python identifier address
-    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
+    initials = property(__initials.value, __initials.set, None, None)
 
     
-    address = property(__address.value, __address.set, None, None)
+    # Element {http://kolab.org}prefix uses Python identifier prefix
+    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
 
     
-    # Element {http://kolab.org}office-location uses Python identifier office_location
-    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
+    prefix = property(__prefix.value, __prefix.set, None, None)
 
-    
-    office_location = property(__office_location.value, __office_location.set, None, None)
 
-    
-    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
-    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
+    _ElementMap = {
+        __middle_names.name() : __middle_names,
+        __given_name.name() : __given_name,
+        __last_name.name() : __last_name,
+        __full_name.name() : __full_name,
+        __suffix.name() : __suffix,
+        __initials.name() : __initials,
+        __prefix.name() : __prefix
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Name', Name)
 
-    
-    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
 
+# Complex type Recurrence with content type ELEMENT_ONLY
+class Recurrence (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}children uses Python identifier children
-    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
+    # Element {http://kolab.org}rangetype uses Python identifier rangetype
+    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
 
     
-    children = property(__children.value, __children.set, None, None)
+    rangetype = property(__rangetype.value, __rangetype.set, None, None)
 
     
-    # Element {http://kolab.org}profession uses Python identifier profession
-    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
+    # Element {http://kolab.org}interval uses Python identifier interval
+    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
 
     
-    profession = property(__profession.value, __profession.set, None, None)
+    interval = property(__interval.value, __interval.set, None, None)
 
     
-    # Element {http://kolab.org}latitude uses Python identifier latitude
-    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
+    # Element {http://kolab.org}exclusion uses Python identifier exclusion
+    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
 
     
-    latitude = property(__latitude.value, __latitude.set, None, None)
+    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+
+
+    _ElementMap = {
+        __rangetype.name() : __rangetype,
+        __interval.name() : __interval,
+        __exclusion.name() : __exclusion
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+
 
+# Complex type DailyRecurrence with content type ELEMENT_ONLY
+class DailyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    # Base type is Recurrence
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    # Element {http://kolab.org}longitude uses Python identifier longitude
-    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
-
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    longitude = property(__longitude.value, __longitude.set, None, None)
-
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
     
-    # Attribute version inherited from {http://kolab.org}XMLBase
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
-    _ElementMap = XMLBase._ElementMap.copy()
+
+    _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __manager_name.name() : __manager_name,
-        __assistant.name() : __assistant,
-        __anniversary.name() : __anniversary,
-        __nick_name.name() : __nick_name,
-        __gender.name() : __gender,
-        __birthday.name() : __birthday,
-        __spouse_name.name() : __spouse_name,
-        __picture.name() : __picture,
-        __name.name() : __name,
-        __free_busy_url.name() : __free_busy_url,
-        __organization.name() : __organization,
-        __language.name() : __language,
-        __web_page.name() : __web_page,
-        __phone.name() : __phone,
-        __job_title.name() : __job_title,
-        __im_address.name() : __im_address,
-        __email.name() : __email,
-        __department.name() : __department,
-        __address.name() : __address,
-        __office_location.name() : __office_location,
-        __preferred_address.name() : __preferred_address,
-        __children.name() : __children,
-        __profession.name() : __profession,
-        __latitude.name() : __latitude,
-        __longitude.name() : __longitude
+        
     })
-    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
-        
+        __cycle.name() : __cycle
     })
-Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
+Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
 
 
-# Complex type CTD_ANON with content type ELEMENT_ONLY
-class CTD_ANON (SMTPContact):
+# Complex type SMTPContact with content type ELEMENT_ONLY
+class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = None
-    # Base type is SMTPContact
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}role uses Python identifier role
-    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_CTD_ANON_httpkolab_orgrole', False)
+    # Element {http://kolab.org}display-name uses Python identifier display_name
+    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
 
     
-    role = property(__role.value, __role.set, None, None)
+    display_name = property(__display_name.value, __display_name.set, None, None)
+
+    
+    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
+    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
+
+    
+    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+
+
+    _ElementMap = {
+        __display_name.name() : __display_name,
+        __smtp_address.name() : __smtp_address
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
+
 
+# Complex type Attendee with content type ELEMENT_ONLY
+class Attendee (SMTPContact):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Attendee')
+    # Base type is SMTPContact
     
     # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
     
+    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+    
     # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_CTD_ANON_httpkolab_orgstatus', False)
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Attendee_httpkolab_orgstatus', False)
 
     
     status = property(__status.value, __status.set, None, None)
 
     
-    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+    # Element {http://kolab.org}role uses Python identifier role
+    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_Attendee_httpkolab_orgrole', False)
+
+    
+    role = property(__role.value, __role.set, None, None)
+
     
     # Element {http://kolab.org}request-response uses Python identifier request_response
-    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_CTD_ANON_httpkolab_orgrequest_response', False)
+    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_Attendee_httpkolab_orgrequest_response', False)
 
     
     request_response = property(__request_response.value, __request_response.set, None, None)
@@ -1037,15 +1026,15 @@ class CTD_ANON (SMTPContact):
 
     _ElementMap = SMTPContact._ElementMap.copy()
     _ElementMap.update({
-        __role.name() : __role,
         __status.name() : __status,
+        __role.name() : __role,
         __request_response.name() : __request_response
     })
     _AttributeMap = SMTPContact._AttributeMap.copy()
     _AttributeMap.update({
         
     })
-
+Namespace.addCategoryObject('typeBinding', u'Attendee', Attendee)
 
 
 # Complex type Note with content type ELEMENT_ONLY
@@ -1056,9 +1045,22 @@ class Note (XMLBase):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Note')
     # Base type is XMLBase
     
+    # Element {http://kolab.org}background-color uses Python identifier background_color
+    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False, defaultValue=u'#000000')
+
+    
+    background_color = property(__background_color.value, __background_color.set, None, None)
+
+    
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    
     # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
     __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False, defaultValue=u'#ffff00')
@@ -1067,14 +1069,6 @@ class Note (XMLBase):
     foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
 
     
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
-    
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-    
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-    
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-    
     # Element {http://kolab.org}summary uses Python identifier summary
     __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
 
@@ -1082,26 +1076,21 @@ class Note (XMLBase):
     summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-    
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}background-color uses Python identifier background_color
-    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False, defaultValue=u'#000000')
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    background_color = property(__background_color.value, __background_color.set, None, None)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
+        __background_color.name() : __background_color,
         __foreground_color.name() : __foreground_color,
-        __summary.name() : __summary,
-        __background_color.name() : __background_color
+        __summary.name() : __summary
     })
     _AttributeMap = XMLBase._AttributeMap.copy()
     _AttributeMap.update({
@@ -1110,16 +1099,16 @@ class Note (XMLBase):
 Namespace.addCategoryObject('typeBinding', u'Note', Note)
 
 
-# Complex type CTD_ANON_ with content type EMPTY
-class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
+# Complex type RecurrenceType with content type EMPTY
+class RecurrenceType (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
-    _Abstract = False
-    _ExpandedName = None
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'RecurrenceType')
     # Base type is pyxb.binding.datatypes.anyType
     
     # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_CTD_ANON__type', pyxb.binding.datatypes.string)
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_RecurrenceType_type', pyxb.binding.datatypes.string)
     
     type = property(__type.value, __type.set, None, None)
 
@@ -1130,38 +1119,7 @@ class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
     _AttributeMap = {
         __type.name() : __type
     }
-
-
-
-# Complex type DailyRecurrence with content type ELEMENT_ONLY
-class DailyRecurrence (Recurrence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
-    # Base type is Recurrence
-    
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-    
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-    
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
-    
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
+Namespace.addCategoryObject('typeBinding', u'RecurrenceType', RecurrenceType)
 
 
 # Complex type WeeklyRecurrence with content type ELEMENT_ONLY
@@ -1172,12 +1130,12 @@ class WeeklyRecurrence (Recurrence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
     # Base type is Recurrence
     
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+    
     # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
     # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-    
     # Attribute cycle uses Python identifier cycle
     __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
     
@@ -1203,18 +1161,9 @@ class MonthlyRecurrence (Recurrence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
     # Base type is Recurrence
     
-    # Element {http://kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
-
-    
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
-
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-    
     # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
     # Element {http://kolab.org}day uses Python identifier day
     __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgday', False)
@@ -1223,6 +1172,15 @@ class MonthlyRecurrence (Recurrence):
     day = property(__day.value, __day.set, None, None)
 
     
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
+
+    
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+
+    
     # Attribute type uses Python identifier type
     __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
     
@@ -1237,8 +1195,8 @@ class MonthlyRecurrence (Recurrence):
 
     _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __daynumber.name() : __daynumber,
-        __day.name() : __day
+        __day.name() : __day,
+        __daynumber.name() : __daynumber
     })
     _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
@@ -1248,60 +1206,65 @@ class MonthlyRecurrence (Recurrence):
 Namespace.addCategoryObject('typeBinding', u'MonthlyRecurrence', MonthlyRecurrence)
 
 
-# Complex type CTD_ANON_2 with content type ELEMENT_ONLY
-class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
+# Complex type YearlyRecurrence with content type ELEMENT_ONLY
+class YearlyRecurrence (Recurrence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = None
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_CTD_ANON_2_cycle', pyxb.binding.datatypes.string)
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
+    # Base type is Recurrence
     
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-    _HasWildcardElement = True
-
-    _ElementMap = {
-        
-    }
-    _AttributeMap = {
-        __cycle.name() : __cycle
-    }
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
 
+    
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
 
+    
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}month uses Python identifier month
+    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
 
-# Complex type PhoneNumber with content type ELEMENT_ONLY
-class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}number uses Python identifier number
-    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
+    month = property(__month.value, __month.set, None, None)
 
     
-    number = property(__number.value, __number.set, None, None)
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
 
     
-    # Element {http://kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
+    day = property(__day.value, __day.set, None, None)
 
     
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
+    
     type = property(__type.value, __type.set, None, None)
 
+    
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
-    _ElementMap = {
-        __number.name() : __number,
-        __type.name() : __type
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        __daynumber.name() : __daynumber,
+        __month.name() : __month,
+        __day.name() : __day
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __type.name() : __type,
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
 
 
 task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
@@ -1318,61 +1281,72 @@ Namespace.addCategoryObject('elementBinding', note.name().localName(), note)
 
 
 
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
+    )
+PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), Recurrence, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), Attendee, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON_2, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
 
 Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
 Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1391,27 +1365,27 @@ Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupMod
 
 
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
-
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
 
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
 Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1442,121 +1416,46 @@ Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_oc
 
 
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
-Name._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
-    )
-Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
-
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
-SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
-    )
-SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
 
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
 
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
 
 Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
 
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
-
 Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
 
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
 Address._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=0L, max_occurs=1)
     )
 Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_, scope=Recurrence))
-Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-YearlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'month')), min_occurs=1, max_occurs=1)
-    )
-YearlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
 
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
 
 Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Event._GroupModel_3 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1585,38 +1484,28 @@ Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_
 
 
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
-
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
@@ -1627,44 +1516,54 @@ Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Names
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
 Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
@@ -1680,43 +1579,102 @@ Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel,
 
 
 
-CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
+Name._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=0L, max_occurs=1)
+    )
+Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), RecurrenceType, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
+    )
+Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
+    )
+DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
+    )
+SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+
 
-CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON))
 
-CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON))
-CTD_ANON._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Attendee))
+
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=Attendee))
+
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=Attendee))
+Attendee._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
     )
-CTD_ANON._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+Attendee._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
     )
-CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_2, min_occurs=1, max_occurs=1)
+Attendee._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._GroupModel_2, min_occurs=1, max_occurs=1)
     )
-CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+Attendee._ContentModel = pyxb.binding.content.ParticleModel(Attendee._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
+
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
 
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
-
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
 Note._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Note._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1730,30 +1688,22 @@ Note._GroupModel = pyxb.binding.content.GroupSequence(
 Note._ContentModel = pyxb.binding.content.ParticleModel(Note._GroupModel, min_occurs=1, max_occurs=1)
 
 
-DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
 WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
     )
 WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
-
 MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
 MonthlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
     )
 MonthlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
@@ -1767,18 +1717,25 @@ MonthlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
 MonthlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
-CTD_ANON_2._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
-    )
-CTD_ANON_2._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel, min_occurs=1, max_occurs=1)
-
 
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
     )
-PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
+YearlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'month')), min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)


commit 5ff609359fe650896e8dea520736ef5acf684062
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:42:53 2011 +0100

    Add demonstrative contact.py

diff --git a/contact.py b/contact.py
new file mode 100755
index 0000000..bf9efaf
--- /dev/null
+++ b/contact.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+
+import sys
+
+sys.path.append('.')
+
+from pykolab.contact import Contact
+
+mycontact = Contact()
+
+mycontact.set_email("vanmeeuwen at kolabsys.com", display_name="Jeroen van Meeuwen")
+mycontact.set_name("Jeroen", "Alexander", "van Meeuwen", "Jeroen A. van Meeuwen", "J.A.", "Mr.")
+
+print mycontact.toxml()
\ No newline at end of file


commit 166e8cbd02c387f2275c05e737569ab42ee19186
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:41:41 2011 +0100

    Generated bindings rebased on latest XML schema definition

diff --git a/pykolab/raw/format.py b/pykolab/raw/format.py
index 6b3a5b2..29d9605 100644
--- a/pykolab/raw/format.py
+++ b/pykolab/raw/format.py
@@ -1,7 +1,7 @@
 # ./pykolab/raw/format.py
 # PyXB bindings for NamespaceModule
-# NSM:57793f9fb1566a6e3db3fa9685718c0d26782d75
-# Generated 2011-10-21 14:48:37.851146 by PyXB version 1.1.2
+# NSM:627e20d8ff2455aff19af8f568d2295daed9a405
+# Generated 2011-10-23 17:40:55.068585 by PyXB version 1.1.2
 import pyxb
 import pyxb.binding
 import pyxb.binding.saxer
@@ -11,12 +11,12 @@ import pyxb.utils.domutils
 import sys
 
 # Unique identifier for bindings created at the same time
-_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:6062637e-fbeb-11e0-9097-001f3c5996b7')
+_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:c6ae55ec-fd95-11e0-90b8-001f3c5996b7')
 
 # Import bindings for namespaces imported into schema
 import pyxb.binding.datatypes
 
-Namespace = pyxb.namespace.NamespaceForURI(u'kolab.org', create_if_missing=True)
+Namespace = pyxb.namespace.NamespaceForURI(u'http://kolab.org', create_if_missing=True)
 Namespace.configureCategories(['typeBinding', 'elementBinding'])
 ModuleRecord = Namespace.lookupModuleRecordByUID(_GenerationUID, create_if_missing=True)
 ModuleRecord._setModule(sys.modules[__name__])
@@ -43,19 +43,18 @@ def CreateFromDOM (node, default_namespace=None):
 
 
 # Atomic SimpleTypeDefinition
-class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Sensitivity')
     _Documentation = None
-NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
-NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
-NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
-NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
-NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
-NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
+Sensitivity._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Sensitivity, enum_prefix=None)
+Sensitivity.private = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'private')
+Sensitivity.confidential = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'confidential')
+Sensitivity.public = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'public')
+Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
 
 # Atomic SimpleTypeDefinition
 class STD_ANON (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
@@ -71,57 +70,58 @@ STD_ANON.weekday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'weekd
 STD_ANON._InitializeFacetMap(STD_ANON._CF_enumeration)
 
 # Atomic SimpleTypeDefinition
-class UID (pyxb.binding.datatypes.string):
+class Color (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
     _Documentation = None
-UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
-UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
-UID._InitializeFacetMap(UID._CF_whiteSpace,
-   UID._CF_minLength)
-Namespace.addCategoryObject('typeBinding', u'UID', UID)
+Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
+Color._CF_pattern = pyxb.binding.facets.CF_pattern()
+Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
+Color._InitializeFacetMap(Color._CF_length,
+   Color._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Color', Color)
 
 # Atomic SimpleTypeDefinition
-class Category (pyxb.binding.datatypes.string):
+class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
     _Documentation = None
-Category._CF_pattern = pyxb.binding.facets.CF_pattern()
-Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
-Category._InitializeFacetMap(Category._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Category', Category)
+NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
+NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
+NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
+NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
+NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
+NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
 
 # Atomic SimpleTypeDefinition
-class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class Category (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Sensitivity')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
     _Documentation = None
-Sensitivity._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Sensitivity, enum_prefix=None)
-Sensitivity.private = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'private')
-Sensitivity.confidential = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'confidential')
-Sensitivity.public = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'public')
-Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
+Category._CF_pattern = pyxb.binding.facets.CF_pattern()
+Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
+Category._InitializeFacetMap(Category._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Category', Category)
 
 # Atomic SimpleTypeDefinition
-class Color (pyxb.binding.datatypes.string):
+class UID (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
     _Documentation = None
-Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
-Color._CF_pattern = pyxb.binding.facets.CF_pattern()
-Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
-Color._InitializeFacetMap(Color._CF_length,
-   Color._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Color', Color)
+UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
+UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
+UID._InitializeFacetMap(UID._CF_whiteSpace,
+   UID._CF_minLength)
+Namespace.addCategoryObject('typeBinding', u'UID', UID)
 
 # Complex type XMLBase with content type ELEMENT_ONLY
 class XMLBase (pyxb.binding.basis.complexTypeDefinition):
@@ -131,85 +131,85 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'XMLBase')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}last-modification-date uses Python identifier last_modification_date
-    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__kolab_org_XMLBase_kolab_orglast_modification_date', False)
+    # Element {http://kolab.org}link-attachment uses Python identifier link_attachment
+    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__httpkolab_org_XMLBase_httpkolab_orglink_attachment', True)
 
     
-    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
+    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
 
     
-    # Element {kolab.org}body uses Python identifier body
-    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__kolab_org_XMLBase_kolab_orgbody', False)
+    # Element {http://kolab.org}product-id uses Python identifier product_id
+    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
 
     
-    body = property(__body.value, __body.set, None, None)
+    product_id = property(__product_id.value, __product_id.set, None, None)
 
     
-    # Element {kolab.org}categories uses Python identifier categories
-    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__kolab_org_XMLBase_kolab_orgcategories', False)
+    # Element {http://kolab.org}body uses Python identifier body
+    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
 
     
-    categories = property(__categories.value, __categories.set, None, None)
+    body = property(__body.value, __body.set, None, None)
 
     
-    # Element {kolab.org}inline-attachment uses Python identifier inline_attachment
-    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__kolab_org_XMLBase_kolab_orginline_attachment', True)
+    # Element {http://kolab.org}sensitivity uses Python identifier sensitivity
+    __sensitivity = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), 'sensitivity', '__httpkolab_org_XMLBase_httpkolab_orgsensitivity', False, defaultValue=u'public')
 
     
-    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+    sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
 
     
-    # Element {kolab.org}creation-date uses Python identifier creation_date
-    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__kolab_org_XMLBase_kolab_orgcreation_date', False)
+    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
+    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
 
     
-    creation_date = property(__creation_date.value, __creation_date.set, None, None)
+    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
 
     
-    # Element {kolab.org}link-attachment uses Python identifier link_attachment
-    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__kolab_org_XMLBase_kolab_orglink_attachment', True)
+    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
+    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
 
     
-    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
+    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
 
     
-    # Element {kolab.org}uid uses Python identifier uid
-    __uid = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'uid'), 'uid', '__kolab_org_XMLBase_kolab_orguid', False)
+    # Element {http://kolab.org}uid uses Python identifier uid
+    __uid = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'uid'), 'uid', '__httpkolab_org_XMLBase_httpkolab_orguid', False)
 
     
     uid = property(__uid.value, __uid.set, None, None)
 
     
-    # Element {kolab.org}product-id uses Python identifier product_id
-    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__kolab_org_XMLBase_kolab_orgproduct_id', False)
+    # Element {http://kolab.org}creation-date uses Python identifier creation_date
+    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
 
     
-    product_id = property(__product_id.value, __product_id.set, None, None)
+    creation_date = property(__creation_date.value, __creation_date.set, None, None)
 
     
-    # Element {kolab.org}sensitivity uses Python identifier sensitivity
-    __sensitivity = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), 'sensitivity', '__kolab_org_XMLBase_kolab_orgsensitivity', False)
+    # Element {http://kolab.org}categories uses Python identifier categories
+    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
 
     
-    sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
+    categories = property(__categories.value, __categories.set, None, None)
 
     
     # Attribute version uses Python identifier version
-    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__kolab_org_XMLBase_version', pyxb.binding.datatypes.double)
+    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.double, unicode_default=u'1.0')
     
     version = property(__version.value, __version.set, None, None)
 
 
     _ElementMap = {
-        __last_modification_date.name() : __last_modification_date,
+        __link_attachment.name() : __link_attachment,
+        __product_id.name() : __product_id,
         __body.name() : __body,
-        __categories.name() : __categories,
+        __sensitivity.name() : __sensitivity,
+        __last_modification_date.name() : __last_modification_date,
         __inline_attachment.name() : __inline_attachment,
-        __creation_date.name() : __creation_date,
-        __link_attachment.name() : __link_attachment,
         __uid.name() : __uid,
-        __product_id.name() : __product_id,
-        __sensitivity.name() : __sensitivity
+        __creation_date.name() : __creation_date,
+        __categories.name() : __categories
     }
     _AttributeMap = {
         __version.name() : __version
@@ -217,437 +217,467 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
 Namespace.addCategoryObject('typeBinding', u'XMLBase', XMLBase)
 
 
-# Complex type Contact with content type ELEMENT_ONLY
-class Contact (XMLBase):
+# Complex type Incidence with content type ELEMENT_ONLY
+class Incidence (XMLBase):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
     # Base type is XMLBase
     
-    # Element {kolab.org}phone uses Python identifier phone
-    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__kolab_org_Contact_kolab_orgphone', True)
-
-    
-    phone = property(__phone.value, __phone.set, None, None)
-
-    
-    # Element {kolab.org}email uses Python identifier email
-    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__kolab_org_Contact_kolab_orgemail', True)
+    # Element {http://kolab.org}attendee uses Python identifier attendee
+    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
 
     
-    email = property(__email.value, __email.set, None, None)
+    attendee = property(__attendee.value, __attendee.set, None, None)
 
     
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}address uses Python identifier address
-    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__kolab_org_Contact_kolab_orgaddress', True)
+    # Element {http://kolab.org}location uses Python identifier location
+    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
 
     
-    address = property(__address.value, __address.set, None, None)
+    location = property(__location.value, __location.set, None, None)
 
     
-    # Element {kolab.org}preferred-address uses Python identifier preferred_address
-    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__kolab_org_Contact_kolab_orgpreferred_address', False)
+    # Element {http://kolab.org}alarm uses Python identifier alarm
+    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
 
     
-    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
+    alarm = property(__alarm.value, __alarm.set, None, None)
 
     
-    # Element {kolab.org}office-location uses Python identifier office_location
-    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__kolab_org_Contact_kolab_orgoffice_location', False)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    office_location = property(__office_location.value, __office_location.set, None, None)
+    # Element {http://kolab.org}creator uses Python identifier creator
+    __creator = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creator'), 'creator', '__httpkolab_org_Incidence_httpkolab_orgcreator', False)
 
     
-    # Element {kolab.org}latitude uses Python identifier latitude
-    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__kolab_org_Contact_kolab_orglatitude', False)
+    creator = property(__creator.value, __creator.set, None, None)
 
     
-    latitude = property(__latitude.value, __latitude.set, None, None)
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}job-title uses Python identifier job_title
-    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__kolab_org_Contact_kolab_orgjob_title', False)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    job_title = property(__job_title.value, __job_title.set, None, None)
-
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}manager-name uses Python identifier manager_name
-    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__kolab_org_Contact_kolab_orgmanager_name', False)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    manager_name = property(__manager_name.value, __manager_name.set, None, None)
-
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}im-address uses Python identifier im_address
-    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__kolab_org_Contact_kolab_orgim_address', False)
+    # Element {http://kolab.org}organizer uses Python identifier organizer
+    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
 
     
-    im_address = property(__im_address.value, __im_address.set, None, None)
+    organizer = property(__organizer.value, __organizer.set, None, None)
 
     
-    # Element {kolab.org}assistant uses Python identifier assistant
-    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__kolab_org_Contact_kolab_orgassistant', False)
+    # Element {http://kolab.org}recurrence uses Python identifier recurrence
+    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
 
     
-    assistant = property(__assistant.value, __assistant.set, None, None)
+    recurrence = property(__recurrence.value, __recurrence.set, None, None)
 
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}nick-name uses Python identifier nick_name
-    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__kolab_org_Contact_kolab_orgnick_name', False)
+    # Element {http://kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Incidence_httpkolab_orgsummary', False)
 
     
-    nick_name = property(__nick_name.value, __nick_name.set, None, None)
+    summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}profession uses Python identifier profession
-    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__kolab_org_Contact_kolab_orgprofession', False)
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    
-    profession = property(__profession.value, __profession.set, None, None)
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __attendee.name() : __attendee,
+        __location.name() : __location,
+        __alarm.name() : __alarm,
+        __creator.name() : __creator,
+        __organizer.name() : __organizer,
+        __recurrence.name() : __recurrence,
+        __summary.name() : __summary
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
 
-    
-    # Element {kolab.org}spouse-name uses Python identifier spouse_name
-    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__kolab_org_Contact_kolab_orgspouse_name', False)
 
+# Complex type Task with content type ELEMENT_ONLY
+class Task (Incidence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
+    # Base type is Incidence
     
-    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
-
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}birthday uses Python identifier birthday
-    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__kolab_org_Contact_kolab_orgbirthday', False)
+    # Element {http://kolab.org}completed uses Python identifier completed
+    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
 
     
-    birthday = property(__birthday.value, __birthday.set, None, None)
+    completed = property(__completed.value, __completed.set, None, None)
 
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}anniversary uses Python identifier anniversary
-    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__kolab_org_Contact_kolab_organniversary', False)
-
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    anniversary = property(__anniversary.value, __anniversary.set, None, None)
-
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
     
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}name uses Python identifier name
-    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__kolab_org_Contact_kolab_orgname', False)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    name = property(__name.value, __name.set, None, None)
-
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}picture uses Python identifier picture
-    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__kolab_org_Contact_kolab_orgpicture', False)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    picture = property(__picture.value, __picture.set, None, None)
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
 
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}department uses Python identifier department
-    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__kolab_org_Contact_kolab_orgdepartment', False)
+    status = property(__status.value, __status.set, None, None)
 
     
-    department = property(__department.value, __department.set, None, None)
+    # Element {http://kolab.org}due-date uses Python identifier due_date
+    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
 
     
-    # Element {kolab.org}children uses Python identifier children
-    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__kolab_org_Contact_kolab_orgchildren', False)
+    due_date = property(__due_date.value, __due_date.set, None, None)
 
     
-    children = property(__children.value, __children.set, None, None)
-
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}free-busy-url uses Python identifier free_busy_url
-    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__kolab_org_Contact_kolab_orgfree_busy_url', False)
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
 
     
-    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
+    start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}gender uses Python identifier gender
-    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__kolab_org_Contact_kolab_orggender', False)
+    # Element {http://kolab.org}parent uses Python identifier parent
+    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
 
     
-    gender = property(__gender.value, __gender.set, None, None)
+    parent = property(__parent.value, __parent.set, None, None)
 
     
-    # Element {kolab.org}organization uses Python identifier organization
-    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__kolab_org_Contact_kolab_orgorganization', False)
-
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    organization = property(__organization.value, __organization.set, None, None)
-
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}longitude uses Python identifier longitude
-    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__kolab_org_Contact_kolab_orglongitude', False)
+    # Element {http://kolab.org}priority uses Python identifier priority
+    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
 
     
-    longitude = property(__longitude.value, __longitude.set, None, None)
+    priority = property(__priority.value, __priority.set, None, None)
 
     
-    # Element {kolab.org}language uses Python identifier language
-    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__kolab_org_Contact_kolab_orglanguage', False)
-
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
-    language = property(__language.value, __language.set, None, None)
-
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}web-page uses Python identifier web_page
-    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__kolab_org_Contact_kolab_orgweb_page', False)
-
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    web_page = property(__web_page.value, __web_page.set, None, None)
-
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap = Incidence._ElementMap.copy()
     _ElementMap.update({
-        __phone.name() : __phone,
-        __email.name() : __email,
-        __address.name() : __address,
-        __preferred_address.name() : __preferred_address,
-        __office_location.name() : __office_location,
-        __latitude.name() : __latitude,
-        __job_title.name() : __job_title,
-        __manager_name.name() : __manager_name,
-        __im_address.name() : __im_address,
-        __assistant.name() : __assistant,
-        __nick_name.name() : __nick_name,
-        __profession.name() : __profession,
-        __spouse_name.name() : __spouse_name,
-        __birthday.name() : __birthday,
-        __anniversary.name() : __anniversary,
-        __name.name() : __name,
-        __picture.name() : __picture,
-        __department.name() : __department,
-        __children.name() : __children,
-        __free_busy_url.name() : __free_busy_url,
-        __gender.name() : __gender,
-        __organization.name() : __organization,
-        __longitude.name() : __longitude,
-        __language.name() : __language,
-        __web_page.name() : __web_page
+        __completed.name() : __completed,
+        __status.name() : __status,
+        __due_date.name() : __due_date,
+        __start_date.name() : __start_date,
+        __parent.name() : __parent,
+        __priority.name() : __priority
     })
-    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap = Incidence._AttributeMap.copy()
     _AttributeMap.update({
         
     })
-Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
+Namespace.addCategoryObject('typeBinding', u'Task', Task)
 
 
-# Complex type Recurrence with content type ELEMENT_ONLY
-class Recurrence (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Name with content type ELEMENT_ONLY
+class Name (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}exclusion uses Python identifier exclusion
-    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__kolab_org_Recurrence_kolab_orgexclusion', True)
+    # Element {http://kolab.org}last-name uses Python identifier last_name
+    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
 
     
-    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+    last_name = property(__last_name.value, __last_name.set, None, None)
 
     
-    # Element {kolab.org}interval uses Python identifier interval
-    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__kolab_org_Recurrence_kolab_orginterval', False)
+    # Element {http://kolab.org}initials uses Python identifier initials
+    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
 
     
-    interval = property(__interval.value, __interval.set, None, None)
+    initials = property(__initials.value, __initials.set, None, None)
 
     
-    # Element {kolab.org}rangetype uses Python identifier rangetype
-    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__kolab_org_Recurrence_kolab_orgrangetype', False)
+    # Element {http://kolab.org}full-name uses Python identifier full_name
+    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
 
     
-    rangetype = property(__rangetype.value, __rangetype.set, None, None)
+    full_name = property(__full_name.value, __full_name.set, None, None)
 
+    
+    # Element {http://kolab.org}given-name uses Python identifier given_name
+    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
 
-    _ElementMap = {
-        __exclusion.name() : __exclusion,
-        __interval.name() : __interval,
-        __rangetype.name() : __rangetype
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+    
+    given_name = property(__given_name.value, __given_name.set, None, None)
 
+    
+    # Element {http://kolab.org}prefix uses Python identifier prefix
+    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
 
-# Complex type YearlyRecurrence with content type ELEMENT_ONLY
-class YearlyRecurrence (Recurrence):
+    
+    prefix = property(__prefix.value, __prefix.set, None, None)
+
+    
+    # Element {http://kolab.org}middle-names uses Python identifier middle_names
+    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
+
+    
+    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+
+    
+    # Element {http://kolab.org}suffix uses Python identifier suffix
+    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
+
+    
+    suffix = property(__suffix.value, __suffix.set, None, None)
+
+
+    _ElementMap = {
+        __last_name.name() : __last_name,
+        __initials.name() : __initials,
+        __full_name.name() : __full_name,
+        __given_name.name() : __given_name,
+        __prefix.name() : __prefix,
+        __middle_names.name() : __middle_names,
+        __suffix.name() : __suffix
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Name', Name)
+
+
+# Complex type SMTPContact with content type ELEMENT_ONLY
+class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
-    # Base type is Recurrence
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__kolab_org_YearlyRecurrence_kolab_orgdaynumber', False)
+    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
+    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
 
     
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
 
     
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
-    
-    # Element {kolab.org}month uses Python identifier month
-    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__kolab_org_YearlyRecurrence_kolab_orgmonth', False)
+    # Element {http://kolab.org}display-name uses Python identifier display_name
+    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
 
     
-    month = property(__month.value, __month.set, None, None)
+    display_name = property(__display_name.value, __display_name.set, None, None)
+
+
+    _ElementMap = {
+        __smtp_address.name() : __smtp_address,
+        __display_name.name() : __display_name
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
 
+
+# Complex type Address with content type ELEMENT_ONLY
+class Address (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__kolab_org_YearlyRecurrence_kolab_orgday', False)
+    # Element {http://kolab.org}locality uses Python identifier locality
+    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
 
     
-    day = property(__day.value, __day.set, None, None)
+    locality = property(__locality.value, __locality.set, None, None)
 
     
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    # Element {http://kolab.org}region uses Python identifier region
+    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
+
     
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    region = property(__region.value, __region.set, None, None)
+
     
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_YearlyRecurrence_type', STD_ANON, required=True)
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
+
     
     type = property(__type.value, __type.set, None, None)
 
     
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
+    # Element {http://kolab.org}postal-code uses Python identifier postal_code
+    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
+
     
-    cycle = property(__cycle.value, __cycle.set, None, None)
+    postal_code = property(__postal_code.value, __postal_code.set, None, None)
 
+    
+    # Element {http://kolab.org}street uses Python identifier street
+    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
 
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        __daynumber.name() : __daynumber,
-        __month.name() : __month,
-        __day.name() : __day
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
+    
+    street = property(__street.value, __street.set, None, None)
+
+    
+    # Element {http://kolab.org}country uses Python identifier country
+    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
+
+    
+    country = property(__country.value, __country.set, None, None)
+
+
+    _ElementMap = {
+        __locality.name() : __locality,
+        __region.name() : __region,
         __type.name() : __type,
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
+        __postal_code.name() : __postal_code,
+        __street.name() : __street,
+        __country.name() : __country
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Address', Address)
 
 
-# Complex type Incidence with content type ELEMENT_ONLY
-class Incidence (XMLBase):
+# Complex type Recurrence with content type ELEMENT_ONLY
+class Recurrence (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
-    # Base type is XMLBase
-    
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
-    
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}recurrence uses Python identifier recurrence
-    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__kolab_org_Incidence_kolab_orgrecurrence', False)
+    # Element {http://kolab.org}interval uses Python identifier interval
+    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
 
     
-    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+    interval = property(__interval.value, __interval.set, None, None)
 
     
-    # Element {kolab.org}organizer uses Python identifier organizer
-    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__kolab_org_Incidence_kolab_orgorganizer', False)
+    # Element {http://kolab.org}exclusion uses Python identifier exclusion
+    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
 
     
-    organizer = property(__organizer.value, __organizer.set, None, None)
+    exclusion = property(__exclusion.value, __exclusion.set, None, None)
 
     
-    # Element {kolab.org}summary uses Python identifier summary
-    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__kolab_org_Incidence_kolab_orgsummary', False)
+    # Element {http://kolab.org}rangetype uses Python identifier rangetype
+    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
 
     
-    summary = property(__summary.value, __summary.set, None, None)
+    rangetype = property(__rangetype.value, __rangetype.set, None, None)
 
+
+    _ElementMap = {
+        __interval.name() : __interval,
+        __exclusion.name() : __exclusion,
+        __rangetype.name() : __rangetype
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+
+
+# Complex type YearlyRecurrence with content type ELEMENT_ONLY
+class YearlyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
+    # Base type is Recurrence
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}alarm uses Python identifier alarm
-    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__kolab_org_Incidence_kolab_orgalarm', False)
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
 
     
-    alarm = property(__alarm.value, __alarm.set, None, None)
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
 
     
-    # Element {kolab.org}location uses Python identifier location
-    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__kolab_org_Incidence_kolab_orglocation', False)
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
 
     
-    location = property(__location.value, __location.set, None, None)
+    day = property(__day.value, __day.set, None, None)
 
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    # Element {kolab.org}attendee uses Python identifier attendee
-    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__kolab_org_Incidence_kolab_orgattendee', False)
+    # Element {http://kolab.org}month uses Python identifier month
+    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
 
     
-    attendee = property(__attendee.value, __attendee.set, None, None)
+    month = property(__month.value, __month.set, None, None)
 
     
-    # Element {kolab.org}creator uses Python identifier creator
-    __creator = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creator'), 'creator', '__kolab_org_Incidence_kolab_orgcreator', False)
-
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', STD_ANON, required=True)
     
-    creator = property(__creator.value, __creator.set, None, None)
+    type = property(__type.value, __type.set, None, None)
 
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
-    
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
-    
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
-    _ElementMap = XMLBase._ElementMap.copy()
+
+    _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __recurrence.name() : __recurrence,
-        __organizer.name() : __organizer,
-        __summary.name() : __summary,
-        __alarm.name() : __alarm,
-        __location.name() : __location,
-        __attendee.name() : __attendee,
-        __creator.name() : __creator
+        __daynumber.name() : __daynumber,
+        __day.name() : __day,
+        __month.name() : __month
     })
-    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
-        
+        __type.name() : __type,
+        __cycle.name() : __cycle
     })
-Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
+Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
 
 
 # Complex type Event with content type ELEMENT_ONLY
@@ -658,74 +688,74 @@ class Event (Incidence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
     # Base type is Incidence
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}end-date uses Python identifier end_date
-    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__kolab_org_Event_kolab_orgend_date', False)
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
 
     
-    end_date = property(__end_date.value, __end_date.set, None, None)
+    start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    # Element recurrence ({kolab.org}recurrence) inherited from {kolab.org}Incidence
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+    
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__kolab_org_Event_kolab_orgstart_date', False)
+    # Element {http://kolab.org}end-date uses Python identifier end_date
+    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
 
     
-    start_date = property(__start_date.value, __start_date.set, None, None)
+    end_date = property(__end_date.value, __end_date.set, None, None)
 
     
-    # Element summary ({kolab.org}summary) inherited from {kolab.org}Incidence
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element organizer ({kolab.org}organizer) inherited from {kolab.org}Incidence
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    # Element location ({kolab.org}location) inherited from {kolab.org}Incidence
+    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
+    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
+
+    
+    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
+
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element alarm ({kolab.org}alarm) inherited from {kolab.org}Incidence
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}color-label uses Python identifier color_label
-    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__kolab_org_Event_kolab_orgcolor_label', False)
+    # Element {http://kolab.org}color-label uses Python identifier color_label
+    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
 
     
     color_label = property(__color_label.value, __color_label.set, None, None)
 
     
-    # Element attendee ({kolab.org}attendee) inherited from {kolab.org}Incidence
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
-    # Element creator ({kolab.org}creator) inherited from {kolab.org}Incidence
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}show-time-as uses Python identifier show_time_as
-    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__kolab_org_Event_kolab_orgshow_time_as', False)
-
-    
-    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = Incidence._ElementMap.copy()
     _ElementMap.update({
-        __end_date.name() : __end_date,
         __start_date.name() : __start_date,
-        __color_label.name() : __color_label,
-        __show_time_as.name() : __show_time_as
+        __end_date.name() : __end_date,
+        __show_time_as.name() : __show_time_as,
+        __color_label.name() : __color_label
     })
     _AttributeMap = Incidence._AttributeMap.copy()
     _AttributeMap.update({
@@ -734,172 +764,282 @@ class Event (Incidence):
 Namespace.addCategoryObject('typeBinding', u'Event', Event)
 
 
-# Complex type Name with content type ELEMENT_ONLY
-class Name (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Contact with content type ELEMENT_ONLY
+class Contact (XMLBase):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
-    # Base type is pyxb.binding.datatypes.anyType
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    # Base type is XMLBase
     
-    # Element {kolab.org}prefix uses Python identifier prefix
-    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__kolab_org_Name_kolab_orgprefix', False)
+    # Element {http://kolab.org}manager-name uses Python identifier manager_name
+    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
 
     
-    prefix = property(__prefix.value, __prefix.set, None, None)
+    manager_name = property(__manager_name.value, __manager_name.set, None, None)
 
     
-    # Element {kolab.org}suffix uses Python identifier suffix
-    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__kolab_org_Name_kolab_orgsuffix', False)
+    # Element {http://kolab.org}assistant uses Python identifier assistant
+    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
 
     
-    suffix = property(__suffix.value, __suffix.set, None, None)
+    assistant = property(__assistant.value, __assistant.set, None, None)
 
     
-    # Element {kolab.org}last-name uses Python identifier last_name
-    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__kolab_org_Name_kolab_orglast_name', False)
+    # Element {http://kolab.org}anniversary uses Python identifier anniversary
+    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
 
     
-    last_name = property(__last_name.value, __last_name.set, None, None)
+    anniversary = property(__anniversary.value, __anniversary.set, None, None)
 
     
-    # Element {kolab.org}initials uses Python identifier initials
-    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__kolab_org_Name_kolab_orginitials', False)
+    # Element {http://kolab.org}nick-name uses Python identifier nick_name
+    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
 
     
-    initials = property(__initials.value, __initials.set, None, None)
+    nick_name = property(__nick_name.value, __nick_name.set, None, None)
 
     
-    # Element {kolab.org}full-name uses Python identifier full_name
-    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__kolab_org_Name_kolab_orgfull_name', False)
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}gender uses Python identifier gender
+    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
 
     
-    full_name = property(__full_name.value, __full_name.set, None, None)
+    gender = property(__gender.value, __gender.set, None, None)
 
     
-    # Element {kolab.org}given-name uses Python identifier given_name
-    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__kolab_org_Name_kolab_orggiven_name', False)
+    # Element {http://kolab.org}birthday uses Python identifier birthday
+    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
 
     
-    given_name = property(__given_name.value, __given_name.set, None, None)
+    birthday = property(__birthday.value, __birthday.set, None, None)
 
     
-    # Element {kolab.org}middle-names uses Python identifier middle_names
-    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__kolab_org_Name_kolab_orgmiddle_names', False)
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
+    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
 
     
-    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
 
+    
+    # Element {http://kolab.org}picture uses Python identifier picture
+    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
 
-    _ElementMap = {
-        __prefix.name() : __prefix,
-        __suffix.name() : __suffix,
-        __last_name.name() : __last_name,
-        __initials.name() : __initials,
-        __full_name.name() : __full_name,
-        __given_name.name() : __given_name,
-        __middle_names.name() : __middle_names
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Name', Name)
+    
+    picture = property(__picture.value, __picture.set, None, None)
 
+    
+    # Element {http://kolab.org}name uses Python identifier name
+    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
 
-# Complex type SMTPContact with content type ELEMENT_ONLY
-class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}smtp-address uses Python identifier smtp_address
-    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__kolab_org_SMTPContact_kolab_orgsmtp_address', False)
+    name = property(__name.value, __name.set, None, None)
 
     
-    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
+    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
 
     
-    # Element {kolab.org}display-name uses Python identifier display_name
-    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__kolab_org_SMTPContact_kolab_orgdisplay_name', False)
+    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
 
     
-    display_name = property(__display_name.value, __display_name.set, None, None)
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}organization uses Python identifier organization
+    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
 
+    
+    organization = property(__organization.value, __organization.set, None, None)
 
-    _ElementMap = {
-        __smtp_address.name() : __smtp_address,
-        __display_name.name() : __display_name
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
+    
+    # Element {http://kolab.org}language uses Python identifier language
+    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
 
+    
+    language = property(__language.value, __language.set, None, None)
 
-# Complex type CTD_ANON with content type ELEMENT_ONLY
-class CTD_ANON (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = None
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_CTD_ANON_cycle', pyxb.binding.datatypes.string)
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    cycle = property(__cycle.value, __cycle.set, None, None)
+    # Element {http://kolab.org}web-page uses Python identifier web_page
+    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
 
-    _HasWildcardElement = True
+    
+    web_page = property(__web_page.value, __web_page.set, None, None)
 
-    _ElementMap = {
-        
-    }
-    _AttributeMap = {
-        __cycle.name() : __cycle
-    }
+    
+    # Element {http://kolab.org}phone uses Python identifier phone
+    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
+
+    
+    phone = property(__phone.value, __phone.set, None, None)
+
+    
+    # Element {http://kolab.org}job-title uses Python identifier job_title
+    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
+
+    
+    job_title = property(__job_title.value, __job_title.set, None, None)
+
+    
+    # Element {http://kolab.org}im-address uses Python identifier im_address
+    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
+
+    
+    im_address = property(__im_address.value, __im_address.set, None, None)
+
+    
+    # Element {http://kolab.org}email uses Python identifier email
+    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
+
+    
+    email = property(__email.value, __email.set, None, None)
+
+    
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}department uses Python identifier department
+    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
+
+    
+    department = property(__department.value, __department.set, None, None)
+
+    
+    # Element {http://kolab.org}address uses Python identifier address
+    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
+
+    
+    address = property(__address.value, __address.set, None, None)
+
+    
+    # Element {http://kolab.org}office-location uses Python identifier office_location
+    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
+
+    
+    office_location = property(__office_location.value, __office_location.set, None, None)
+
+    
+    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
+    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
+
+    
+    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
+
+    
+    # Element {http://kolab.org}children uses Python identifier children
+    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
+
+    
+    children = property(__children.value, __children.set, None, None)
+
+    
+    # Element {http://kolab.org}profession uses Python identifier profession
+    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
+
+    
+    profession = property(__profession.value, __profession.set, None, None)
+
+    
+    # Element {http://kolab.org}latitude uses Python identifier latitude
+    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
+
+    
+    latitude = property(__latitude.value, __latitude.set, None, None)
 
+    
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}longitude uses Python identifier longitude
+    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
+
+    
+    longitude = property(__longitude.value, __longitude.set, None, None)
+
+    
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __manager_name.name() : __manager_name,
+        __assistant.name() : __assistant,
+        __anniversary.name() : __anniversary,
+        __nick_name.name() : __nick_name,
+        __gender.name() : __gender,
+        __birthday.name() : __birthday,
+        __spouse_name.name() : __spouse_name,
+        __picture.name() : __picture,
+        __name.name() : __name,
+        __free_busy_url.name() : __free_busy_url,
+        __organization.name() : __organization,
+        __language.name() : __language,
+        __web_page.name() : __web_page,
+        __phone.name() : __phone,
+        __job_title.name() : __job_title,
+        __im_address.name() : __im_address,
+        __email.name() : __email,
+        __department.name() : __department,
+        __address.name() : __address,
+        __office_location.name() : __office_location,
+        __preferred_address.name() : __preferred_address,
+        __children.name() : __children,
+        __profession.name() : __profession,
+        __latitude.name() : __latitude,
+        __longitude.name() : __longitude
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
 
 
-# Complex type CTD_ANON_ with content type ELEMENT_ONLY
-class CTD_ANON_ (SMTPContact):
+# Complex type CTD_ANON with content type ELEMENT_ONLY
+class CTD_ANON (SMTPContact):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
     _ExpandedName = None
     # Base type is SMTPContact
     
-    # Element smtp_address ({kolab.org}smtp-address) inherited from {kolab.org}SMTPContact
-    
-    # Element display_name ({kolab.org}display-name) inherited from {kolab.org}SMTPContact
-    
-    # Element {kolab.org}request-response uses Python identifier request_response
-    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__kolab_org_CTD_ANON__kolab_orgrequest_response', False)
+    # Element {http://kolab.org}role uses Python identifier role
+    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_CTD_ANON_httpkolab_orgrole', False)
 
     
-    request_response = property(__request_response.value, __request_response.set, None, None)
+    role = property(__role.value, __role.set, None, None)
 
     
-    # Element {kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__kolab_org_CTD_ANON__kolab_orgstatus', False)
+    # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
+    
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_CTD_ANON_httpkolab_orgstatus', False)
 
     
     status = property(__status.value, __status.set, None, None)
 
     
-    # Element {kolab.org}role uses Python identifier role
-    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__kolab_org_CTD_ANON__kolab_orgrole', False)
+    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+    
+    # Element {http://kolab.org}request-response uses Python identifier request_response
+    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_CTD_ANON_httpkolab_orgrequest_response', False)
 
     
-    role = property(__role.value, __role.set, None, None)
+    request_response = property(__request_response.value, __request_response.set, None, None)
 
 
     _ElementMap = SMTPContact._ElementMap.copy()
     _ElementMap.update({
-        __request_response.name() : __request_response,
+        __role.name() : __role,
         __status.name() : __status,
-        __role.name() : __role
+        __request_response.name() : __request_response
     })
     _AttributeMap = SMTPContact._AttributeMap.copy()
     _AttributeMap.update({
@@ -916,52 +1056,52 @@ class Note (XMLBase):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Note')
     # Base type is XMLBase
     
-    # Element {kolab.org}background-color uses Python identifier background_color
-    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__kolab_org_Note_kolab_orgbackground_color', False)
-
-    
-    background_color = property(__background_color.value, __background_color.set, None, None)
-
-    
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}foreground-color uses Python identifier foreground_color
-    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__kolab_org_Note_kolab_orgforeground_color', False)
+    # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
+    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False, defaultValue=u'#ffff00')
 
     
     foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
 
     
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}summary uses Python identifier summary
-    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__kolab_org_Note_kolab_orgsummary', False)
+    # Element {http://kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
 
     
     summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    # Element {http://kolab.org}background-color uses Python identifier background_color
+    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False, defaultValue=u'#000000')
+
+    
+    background_color = property(__background_color.value, __background_color.set, None, None)
+
+    
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
-        __background_color.name() : __background_color,
         __foreground_color.name() : __foreground_color,
-        __summary.name() : __summary
+        __summary.name() : __summary,
+        __background_color.name() : __background_color
     })
     _AttributeMap = XMLBase._AttributeMap.copy()
     _AttributeMap.update({
@@ -970,40 +1110,8 @@ class Note (XMLBase):
 Namespace.addCategoryObject('typeBinding', u'Note', Note)
 
 
-# Complex type PhoneNumber with content type ELEMENT_ONLY
-class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Element {kolab.org}number uses Python identifier number
-    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__kolab_org_PhoneNumber_kolab_orgnumber', False)
-
-    
-    number = property(__number.value, __number.set, None, None)
-
-    
-    # Element {kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__kolab_org_PhoneNumber_kolab_orgtype', False)
-
-    
-    type = property(__type.value, __type.set, None, None)
-
-
-    _ElementMap = {
-        __number.name() : __number,
-        __type.name() : __type
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
-
-
-# Complex type CTD_ANON_2 with content type EMPTY
-class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
+# Complex type CTD_ANON_ with content type EMPTY
+class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
     _Abstract = False
@@ -1011,7 +1119,7 @@ class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
     # Base type is pyxb.binding.datatypes.anyType
     
     # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_CTD_ANON_2_type', pyxb.binding.datatypes.string)
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_CTD_ANON__type', pyxb.binding.datatypes.string)
     
     type = property(__type.value, __type.set, None, None)
 
@@ -1025,86 +1133,53 @@ class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
 
 
 
-# Complex type Address with content type ELEMENT_ONLY
-class Address (pyxb.binding.basis.complexTypeDefinition):
+# Complex type DailyRecurrence with content type ELEMENT_ONLY
+class DailyRecurrence (Recurrence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Element {kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__kolab_org_Address_kolab_orgtype', False)
-
-    
-    type = property(__type.value, __type.set, None, None)
-
-    
-    # Element {kolab.org}postal-code uses Python identifier postal_code
-    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__kolab_org_Address_kolab_orgpostal_code', False)
-
-    
-    postal_code = property(__postal_code.value, __postal_code.set, None, None)
-
-    
-    # Element {kolab.org}street uses Python identifier street
-    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__kolab_org_Address_kolab_orgstreet', False)
-
-    
-    street = property(__street.value, __street.set, None, None)
-
-    
-    # Element {kolab.org}locality uses Python identifier locality
-    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__kolab_org_Address_kolab_orglocality', False)
-
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    # Base type is Recurrence
     
-    locality = property(__locality.value, __locality.set, None, None)
-
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    # Element {kolab.org}country uses Python identifier country
-    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__kolab_org_Address_kolab_orgcountry', False)
-
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    country = property(__country.value, __country.set, None, None)
-
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    # Element {kolab.org}region uses Python identifier region
-    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__kolab_org_Address_kolab_orgregion', False)
-
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
     
-    region = property(__region.value, __region.set, None, None)
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
 
-    _ElementMap = {
-        __type.name() : __type,
-        __postal_code.name() : __postal_code,
-        __street.name() : __street,
-        __locality.name() : __locality,
-        __country.name() : __country,
-        __region.name() : __region
-    }
-    _AttributeMap = {
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
         
-    }
-Namespace.addCategoryObject('typeBinding', u'Address', Address)
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
 
 
-# Complex type DailyRecurrence with content type ELEMENT_ONLY
-class DailyRecurrence (Recurrence):
+# Complex type WeeklyRecurrence with content type ELEMENT_ONLY
+class WeeklyRecurrence (Recurrence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
     # Base type is Recurrence
     
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
     # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
     
     cycle = property(__cycle.value, __cycle.set, None, None)
 
@@ -1117,7 +1192,7 @@ class DailyRecurrence (Recurrence):
     _AttributeMap.update({
         __cycle.name() : __cycle
     })
-Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
+Namespace.addCategoryObject('typeBinding', u'WeeklyRecurrence', WeeklyRecurrence)
 
 
 # Complex type MonthlyRecurrence with content type ELEMENT_ONLY
@@ -1128,42 +1203,42 @@ class MonthlyRecurrence (Recurrence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
     # Base type is Recurrence
     
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
-    
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
-    
-    # Element {kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__kolab_org_MonthlyRecurrence_kolab_orgday', False)
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
 
     
-    day = property(__day.value, __day.set, None, None)
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
 
     
-    # Element {kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__kolab_org_MonthlyRecurrence_kolab_orgdaynumber', False)
-
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+    
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgday', False)
 
     
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    day = property(__day.value, __day.set, None, None)
+
     
     # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
     
     type = property(__type.value, __type.set, None, None)
 
     
     # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_MonthlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'monthly', required=True)
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_MonthlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'monthly', required=True)
     
     cycle = property(__cycle.value, __cycle.set, None, None)
 
 
     _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __day.name() : __day,
-        __daynumber.name() : __daynumber
+        __daynumber.name() : __daynumber,
+        __day.name() : __day
     })
     _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
@@ -1173,168 +1248,93 @@ class MonthlyRecurrence (Recurrence):
 Namespace.addCategoryObject('typeBinding', u'MonthlyRecurrence', MonthlyRecurrence)
 
 
-# Complex type WeeklyRecurrence with content type ELEMENT_ONLY
-class WeeklyRecurrence (Recurrence):
+# Complex type CTD_ANON_2 with content type ELEMENT_ONLY
+class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
-    # Base type is Recurrence
-    
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
-    
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
-    
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    _ExpandedName = None
+    # Base type is pyxb.binding.datatypes.anyType
     
     # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_CTD_ANON_2_cycle', pyxb.binding.datatypes.string)
     
     cycle = property(__cycle.value, __cycle.set, None, None)
 
+    _HasWildcardElement = True
 
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
+    _ElementMap = {
         
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
+    }
+    _AttributeMap = {
         __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'WeeklyRecurrence', WeeklyRecurrence)
+    }
 
 
-# Complex type Task with content type ELEMENT_ONLY
-class Task (Incidence):
+
+# Complex type PhoneNumber with content type ELEMENT_ONLY
+class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
-    # Base type is Incidence
-    
-    # Element organizer ({kolab.org}organizer) inherited from {kolab.org}Incidence
-    
-    # Element alarm ({kolab.org}alarm) inherited from {kolab.org}Incidence
-    
-    # Element recurrence ({kolab.org}recurrence) inherited from {kolab.org}Incidence
-    
-    # Element location ({kolab.org}location) inherited from {kolab.org}Incidence
-    
-    # Element {kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__kolab_org_Task_kolab_orgstart_date', False)
-
-    
-    start_date = property(__start_date.value, __start_date.set, None, None)
-
-    
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
-    
-    # Element attendee ({kolab.org}attendee) inherited from {kolab.org}Incidence
-    
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}due-date uses Python identifier due_date
-    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__kolab_org_Task_kolab_orgdue_date', False)
-
-    
-    due_date = property(__due_date.value, __due_date.set, None, None)
-
-    
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}parent uses Python identifier parent
-    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__kolab_org_Task_kolab_orgparent', False)
-
-    
-    parent = property(__parent.value, __parent.set, None, None)
-
-    
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
-    
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
-    
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}priority uses Python identifier priority
-    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__kolab_org_Task_kolab_orgpriority', False)
-
-    
-    priority = property(__priority.value, __priority.set, None, None)
-
-    
-    # Element summary ({kolab.org}summary) inherited from {kolab.org}Incidence
-    
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}completed uses Python identifier completed
-    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__kolab_org_Task_kolab_orgcompleted', False)
+    # Element {http://kolab.org}number uses Python identifier number
+    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
 
     
-    completed = property(__completed.value, __completed.set, None, None)
+    number = property(__number.value, __number.set, None, None)
 
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__kolab_org_Task_kolab_orgstatus', False)
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
 
     
-    status = property(__status.value, __status.set, None, None)
+    type = property(__type.value, __type.set, None, None)
 
-    
-    # Element creator ({kolab.org}creator) inherited from {kolab.org}Incidence
-    
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
-    
-    # Attribute version inherited from {kolab.org}XMLBase
 
-    _ElementMap = Incidence._ElementMap.copy()
-    _ElementMap.update({
-        __start_date.name() : __start_date,
-        __due_date.name() : __due_date,
-        __parent.name() : __parent,
-        __priority.name() : __priority,
-        __completed.name() : __completed,
-        __status.name() : __status
-    })
-    _AttributeMap = Incidence._AttributeMap.copy()
-    _AttributeMap.update({
+    _ElementMap = {
+        __number.name() : __number,
+        __type.name() : __type
+    }
+    _AttributeMap = {
         
-    })
-Namespace.addCategoryObject('typeBinding', u'Task', Task)
+    }
+Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
 
 
-contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
-Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
+task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
+Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
 
 event = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'event'), Event)
 Namespace.addCategoryObject('elementBinding', event.name().localName(), event)
 
+contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
+Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
+
 note = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'note'), Note)
 Namespace.addCategoryObject('elementBinding', note.name().localName(), note)
 
-task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
-Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
 
 
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
 XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
@@ -1350,106 +1350,163 @@ XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel,
 
 
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'office-location'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON_2, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
+Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
+Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_2, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_3, min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_4 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'priority')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'completed')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'due-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'parent')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_4, min_occurs=1, max_occurs=1)
+    )
+Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_occurs=1, max_occurs=1)
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
-Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'preferred-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'latitude')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'longitude')), min_occurs=1, max_occurs=1)
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+Name._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
     )
-Contact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._GroupModel_2, min_occurs=1, max_occurs=1)
+Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
+SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
     )
-Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
+SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
+Address._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
+    )
+Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
+
+
 
 Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
 
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_2, scope=Recurrence))
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_, scope=Recurrence))
 Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1461,9 +1518,9 @@ Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupM
 
 YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
 YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1483,54 +1540,13 @@ YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurr
 
 
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON_, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
-Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Incidence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
-
-
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 
 Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
 
 Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
 Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
@@ -1569,76 +1585,128 @@ Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_
 
 
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
-Name._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
-    )
-Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
 
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
 
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
-SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
-    )
-SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
 
-CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
-    )
-CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'office-location'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
 
-CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
 
-CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
 
-CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
-CTD_ANON_._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
     )
-CTD_ANON_._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'preferred-address')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'latitude')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'longitude')), min_occurs=0L, max_occurs=1)
     )
-CTD_ANON_._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel_2, min_occurs=1, max_occurs=1)
+Contact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_2, min_occurs=1, max_occurs=1)
     )
-CTD_ANON_._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel, min_occurs=1, max_occurs=1)
+Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
+CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+
+CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+
+CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+CTD_ANON._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+
+
 
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
 
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
 Note._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
@@ -1662,40 +1730,6 @@ Note._GroupModel = pyxb.binding.content.GroupSequence(
 Note._ContentModel = pyxb.binding.content.ParticleModel(Note._GroupModel, min_occurs=1, max_occurs=1)
 
 
-
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
-    )
-PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
-Address._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
-    )
-Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
-
-
 DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1704,10 +1738,18 @@ DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
 DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
+WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
 
-MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
 
 MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
 MonthlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1725,60 +1767,18 @@ MonthlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
 MonthlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
-WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+CTD_ANON_2._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
     )
-WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+CTD_ANON_2._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel, min_occurs=1, max_occurs=1)
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
-Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._GroupModel_2, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._GroupModel_3, min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_4 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'priority')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'completed')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=0L, max_occurs=1L),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'due-date')), min_occurs=0L, max_occurs=1L),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'parent')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._GroupModel_4, min_occurs=1, max_occurs=1)
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
     )
-Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_occurs=1, max_occurs=1)
+PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)


commit f0b965a9e7ab6b855d0692e2ee9f0c90e4776d94
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 15:52:28 2011 +0100

    Wrap generated raw classes

diff --git a/pykolab/format.py b/pykolab/format.py
index 1229081..459e803 100644
--- a/pykolab/format.py
+++ b/pykolab/format.py
@@ -1,5 +1,31 @@
 from pykolab.raw.format import *
 
+import pyxb.namespace
 import pyxb.utils.domutils
 
 pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)
+
+__all__ = [
+        "Contact",
+        "Event",
+        "Incidence",
+        "Note",
+        "Task",
+
+        "SMTPContact"
+    ]
+
+# The following are class name overrides allowing the XML generated to use
+# lowercase tag names.
+class Contact(Contact):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'contact')
+
+class Event(Event):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'event')
+    pass
+
+class Note(Note):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'note')
+
+class Task(Task):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'task')


commit 4e1681d845af0d629391b1d2499b2a9f5ec769c0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 12:42:40 2011 +0100

    No newline at the end of this file

diff --git a/pykolab/format.py b/pykolab/format.py
index 4e3d2ee..1229081 100644
--- a/pykolab/format.py
+++ b/pykolab/format.py
@@ -2,4 +2,4 @@ from pykolab.raw.format import *
 
 import pyxb.utils.domutils
 
-pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)
\ No newline at end of file
+pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)


commit 734ec9a408706f10c4afeceb91b58b8ba0a7784e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 12:42:07 2011 +0100

    Fix deleting the correct file when generating raw bindings with PyXB

diff --git a/Makefile.am b/Makefile.am
index 2634a9c..a48fcd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ rpm: srpm
 	@rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
 
 bindings:
-	@rm -rf pykolab/format.py*
+	@rm -rf pykolab/raw/format.py*
 	@pyxbgen --module-prefix=pykolab -u schemas/base.xsd -u schemas/contact.xsd -u schemas/event.xsd -u schemas/incidence.xsd schemas/note.xsd schemas/task.xsd -m format -r
 
 clean:


commit 3ad79b52732d0bc5e35eca4bcaa05270e2842f79
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 21 14:51:58 2011 +0100

    Regenerated bindings, including default namespace configuration in pykolab.format

diff --git a/pykolab/format.py b/pykolab/format.py
index 94990ff..4e3d2ee 100644
--- a/pykolab/format.py
+++ b/pykolab/format.py
@@ -1,1786 +1,5 @@
-# ./pykolab/format.py
-# PyXB bindings for NamespaceModule
-# NSM:627e20d8ff2455aff19af8f568d2295daed9a405
-# Generated 2011-10-21 13:49:31.742437 by PyXB version 1.1.2
-import pyxb
-import pyxb.binding
-import pyxb.binding.saxer
-import StringIO
-import pyxb.utils.utility
-import pyxb.utils.domutils
-import sys
-
-# Unique identifier for bindings created at the same time
-_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:1eb97ad2-fbe3-11e0-af2c-001f3c5996b7')
-
-# Import bindings for namespaces imported into schema
-import pyxb.binding.datatypes
-
-Namespace = pyxb.namespace.NamespaceForURI(u'http://kolab.org', create_if_missing=True)
-Namespace.configureCategories(['typeBinding', 'elementBinding'])
-ModuleRecord = Namespace.lookupModuleRecordByUID(_GenerationUID, create_if_missing=True)
-ModuleRecord._setModule(sys.modules[__name__])
-
-pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)
-
-def CreateFromDocument (xml_text, default_namespace=None, location_base=None):
-    """Parse the given XML and use the document element to create a Python instance."""
-    if pyxb.XMLStyle_saxer != pyxb._XMLStyle:
-        dom = pyxb.utils.domutils.StringToDOM(xml_text)
-        return CreateFromDOM(dom.documentElement)
-    saxer = pyxb.binding.saxer.make_parser(fallback_namespace=Namespace.fallbackNamespace(), location_base=location_base)
-    handler = saxer.getContentHandler()
-    saxer.parse(StringIO.StringIO(xml_text))
-    instance = handler.rootObject()
-    return instance
-
-def CreateFromDOM (node, default_namespace=None):
-    """Create a Python instance from the given DOM node.
-    The node tag must correspond to an element declaration in this module.
-
-    @deprecated: Forcing use of DOM interface is unnecessary; use L{CreateFromDocument}."""
-    if default_namespace is None:
-        default_namespace = Namespace.fallbackNamespace()
-    return pyxb.binding.basis.element.AnyCreateFromDOM(node, _fallback_namespace=default_namespace)
-
-
-# Atomic SimpleTypeDefinition
-class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
-
-    """An atomic simple type."""
-
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
-    _Documentation = None
-NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
-NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
-NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
-NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
-NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
-NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
-
-# Atomic SimpleTypeDefinition
-class STD_ANON (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
-
-    """An atomic simple type."""
-
-    _ExpandedName = None
-    _Documentation = None
-STD_ANON._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=STD_ANON, enum_prefix=None)
-STD_ANON.monthday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'monthday')
-STD_ANON.yearday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'yearday')
-STD_ANON.weekday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'weekday')
-STD_ANON._InitializeFacetMap(STD_ANON._CF_enumeration)
-
-# Atomic SimpleTypeDefinition
-class UID (pyxb.binding.datatypes.string):
-
-    """An atomic simple type."""
-
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
-    _Documentation = None
-UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
-UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
-UID._InitializeFacetMap(UID._CF_whiteSpace,
-   UID._CF_minLength)
-Namespace.addCategoryObject('typeBinding', u'UID', UID)
-
-# Atomic SimpleTypeDefinition
-class Category (pyxb.binding.datatypes.string):
-
-    """An atomic simple type."""
-
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
-    _Documentation = None
-Category._CF_pattern = pyxb.binding.facets.CF_pattern()
-Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
-Category._InitializeFacetMap(Category._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Category', Category)
-
-# Atomic SimpleTypeDefinition
-class Color (pyxb.binding.datatypes.string):
-
-    """An atomic simple type."""
-
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
-    _Documentation = None
-Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
-Color._CF_pattern = pyxb.binding.facets.CF_pattern()
-Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
-Color._InitializeFacetMap(Color._CF_length,
-   Color._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Color', Color)
-
-# Atomic SimpleTypeDefinition
-class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
-
-    """An atomic simple type."""
-
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Sensitivity')
-    _Documentation = None
-Sensitivity._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Sensitivity, enum_prefix=None)
-Sensitivity.private = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'private')
-Sensitivity.confidential = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'confidential')
-Sensitivity.public = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'public')
-Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
-
-# Complex type SMTPContact with content type ELEMENT_ONLY
-class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
-    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
-
-
-    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
-
-
-    # Element {http://kolab.org}display-name uses Python identifier display_name
-    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
-
-
-    display_name = property(__display_name.value, __display_name.set, None, None)
-
-
-    _ElementMap = {
-        __smtp_address.name() : __smtp_address,
-        __display_name.name() : __display_name
-    }
-    _AttributeMap = {
-
-    }
-Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
-
-
-# Complex type CTD_ANON with content type ELEMENT_ONLY
-class CTD_ANON (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = None
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_CTD_ANON_cycle', pyxb.binding.datatypes.string)
-
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-    _HasWildcardElement = True
-
-    _ElementMap = {
-
-    }
-    _AttributeMap = {
-        __cycle.name() : __cycle
-    }
-
-
-
-# Complex type XMLBase with content type ELEMENT_ONLY
-class XMLBase (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'XMLBase')
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Element {http://kolab.org}body uses Python identifier body
-    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
-
-
-    body = property(__body.value, __body.set, None, None)
-
-
-    # Element {http://kolab.org}product-id uses Python identifier product_id
-    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
-
-
-    product_id = property(__product_id.value, __product_id.set, None, None)
-
-
-    # Element {http://kolab.org}categories uses Python identifier categories
-    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
-
-
-    categories = property(__categories.value, __categories.set, None, None)
-
-
-    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
-    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
-
-
-    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
-
-
-    # Element {http://kolab.org}link-attachment uses Python identifier link_attachment
-    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__httpkolab_org_XMLBase_httpkolab_orglink_attachment', True)
-
-
-    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
-
-
-    # Element {http://kolab.org}creation-date uses Python identifier creation_date
-    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
-
-
-    creation_date = property(__creation_date.value, __creation_date.set, None, None)
-
-
-    # Element {http://kolab.org}sensitivity uses Python identifier sensitivity
-    __sensitivity = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), 'sensitivity', '__httpkolab_org_XMLBase_httpkolab_orgsensitivity', False)
-
-
-    sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
-
-
-    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
-    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
-
-
-    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
-
-
-    # Element {http://kolab.org}uid uses Python identifier uid
-    __uid = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'uid'), 'uid', '__httpkolab_org_XMLBase_httpkolab_orguid', False)
-
-
-    uid = property(__uid.value, __uid.set, None, None)
-
-
-    # Attribute version uses Python identifier version
-    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.double)
-
-    version = property(__version.value, __version.set, None, None)
-
-
-    _ElementMap = {
-        __body.name() : __body,
-        __product_id.name() : __product_id,
-        __categories.name() : __categories,
-        __inline_attachment.name() : __inline_attachment,
-        __link_attachment.name() : __link_attachment,
-        __creation_date.name() : __creation_date,
-        __sensitivity.name() : __sensitivity,
-        __last_modification_date.name() : __last_modification_date,
-        __uid.name() : __uid
-    }
-    _AttributeMap = {
-        __version.name() : __version
-    }
-Namespace.addCategoryObject('typeBinding', u'XMLBase', XMLBase)
-
-
-# Complex type Note with content type ELEMENT_ONLY
-class Note (XMLBase):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Note')
-    # Base type is XMLBase
-
-    # Element {http://kolab.org}background-color uses Python identifier background_color
-    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False)
-
-
-    background_color = property(__background_color.value, __background_color.set, None, None)
-
-
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
-    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False)
-
-
-    foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
-
-
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}summary uses Python identifier summary
-    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
-
-
-    summary = property(__summary.value, __summary.set, None, None)
-
-
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
-
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-
-    # Attribute version inherited from {http://kolab.org}XMLBase
-
-    _ElementMap = XMLBase._ElementMap.copy()
-    _ElementMap.update({
-        __background_color.name() : __background_color,
-        __foreground_color.name() : __foreground_color,
-        __summary.name() : __summary
-    })
-    _AttributeMap = XMLBase._AttributeMap.copy()
-    _AttributeMap.update({
-
-    })
-Namespace.addCategoryObject('typeBinding', u'Note', Note)
-
-
-# Complex type PhoneNumber with content type ELEMENT_ONLY
-class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Element {http://kolab.org}number uses Python identifier number
-    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
-
-
-    number = property(__number.value, __number.set, None, None)
-
-
-    # Element {http://kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
-
-
-    type = property(__type.value, __type.set, None, None)
-
-
-    _ElementMap = {
-        __number.name() : __number,
-        __type.name() : __type
-    }
-    _AttributeMap = {
-
-    }
-Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
-
-
-# Complex type CTD_ANON_ with content type EMPTY
-class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
-    _Abstract = False
-    _ExpandedName = None
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_CTD_ANON__type', pyxb.binding.datatypes.string)
-
-    type = property(__type.value, __type.set, None, None)
-
-
-    _ElementMap = {
-
-    }
-    _AttributeMap = {
-        __type.name() : __type
-    }
-
-
-
-# Complex type Address with content type ELEMENT_ONLY
-class Address (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Element {http://kolab.org}postal-code uses Python identifier postal_code
-    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
-
-
-    postal_code = property(__postal_code.value, __postal_code.set, None, None)
-
-
-    # Element {http://kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False)
-
-
-    type = property(__type.value, __type.set, None, None)
-
-
-    # Element {http://kolab.org}country uses Python identifier country
-    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
-
-
-    country = property(__country.value, __country.set, None, None)
-
-
-    # Element {http://kolab.org}locality uses Python identifier locality
-    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
-
-
-    locality = property(__locality.value, __locality.set, None, None)
-
-
-    # Element {http://kolab.org}street uses Python identifier street
-    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
-
-
-    street = property(__street.value, __street.set, None, None)
-
-
-    # Element {http://kolab.org}region uses Python identifier region
-    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
-
-
-    region = property(__region.value, __region.set, None, None)
-
-
-    _ElementMap = {
-        __postal_code.name() : __postal_code,
-        __type.name() : __type,
-        __country.name() : __country,
-        __locality.name() : __locality,
-        __street.name() : __street,
-        __region.name() : __region
-    }
-    _AttributeMap = {
-
-    }
-Namespace.addCategoryObject('typeBinding', u'Address', Address)
-
-
-# Complex type Recurrence with content type ELEMENT_ONLY
-class Recurrence (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Element {http://kolab.org}exclusion uses Python identifier exclusion
-    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
-
-
-    exclusion = property(__exclusion.value, __exclusion.set, None, None)
-
-
-    # Element {http://kolab.org}interval uses Python identifier interval
-    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
-
-
-    interval = property(__interval.value, __interval.set, None, None)
-
-
-    # Element {http://kolab.org}rangetype uses Python identifier rangetype
-    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
-
-
-    rangetype = property(__rangetype.value, __rangetype.set, None, None)
-
-
-    _ElementMap = {
-        __exclusion.name() : __exclusion,
-        __interval.name() : __interval,
-        __rangetype.name() : __rangetype
-    }
-    _AttributeMap = {
-
-    }
-Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
-
-
-# Complex type DailyRecurrence with content type ELEMENT_ONLY
-class DailyRecurrence (Recurrence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
-    # Base type is Recurrence
-
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
-
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
-
-
-# Complex type MonthlyRecurrence with content type ELEMENT_ONLY
-class MonthlyRecurrence (Recurrence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
-    # Base type is Recurrence
-
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-
-    # Element {http://kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgday', False)
-
-
-    day = property(__day.value, __day.set, None, None)
-
-
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-
-    # Element {http://kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
-
-
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
-
-
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
-
-    type = property(__type.value, __type.set, None, None)
-
-
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_MonthlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'monthly', required=True)
-
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        __day.name() : __day,
-        __daynumber.name() : __daynumber
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __type.name() : __type,
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'MonthlyRecurrence', MonthlyRecurrence)
-
-
-# Complex type Name with content type ELEMENT_ONLY
-class Name (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
-    # Base type is pyxb.binding.datatypes.anyType
-
-    # Element {http://kolab.org}last-name uses Python identifier last_name
-    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
-
-
-    last_name = property(__last_name.value, __last_name.set, None, None)
-
-
-    # Element {http://kolab.org}middle-names uses Python identifier middle_names
-    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
-
-
-    middle_names = property(__middle_names.value, __middle_names.set, None, None)
-
-
-    # Element {http://kolab.org}suffix uses Python identifier suffix
-    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
-
-
-    suffix = property(__suffix.value, __suffix.set, None, None)
-
-
-    # Element {http://kolab.org}initials uses Python identifier initials
-    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
-
-
-    initials = property(__initials.value, __initials.set, None, None)
-
-
-    # Element {http://kolab.org}full-name uses Python identifier full_name
-    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
-
-
-    full_name = property(__full_name.value, __full_name.set, None, None)
-
-
-    # Element {http://kolab.org}given-name uses Python identifier given_name
-    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
-
-
-    given_name = property(__given_name.value, __given_name.set, None, None)
-
-
-    # Element {http://kolab.org}prefix uses Python identifier prefix
-    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
-
-
-    prefix = property(__prefix.value, __prefix.set, None, None)
-
-
-    _ElementMap = {
-        __last_name.name() : __last_name,
-        __middle_names.name() : __middle_names,
-        __suffix.name() : __suffix,
-        __initials.name() : __initials,
-        __full_name.name() : __full_name,
-        __given_name.name() : __given_name,
-        __prefix.name() : __prefix
-    }
-    _AttributeMap = {
-
-    }
-Namespace.addCategoryObject('typeBinding', u'Name', Name)
-
-
-# Complex type Contact with content type ELEMENT_ONLY
-class Contact (XMLBase):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
-    # Base type is XMLBase
-
-    # Element {http://kolab.org}phone uses Python identifier phone
-    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
-
-
-    phone = property(__phone.value, __phone.set, None, None)
-
-
-    # Element {http://kolab.org}im-address uses Python identifier im_address
-    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
-
-
-    im_address = property(__im_address.value, __im_address.set, None, None)
-
-
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}address uses Python identifier address
-    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
-
-
-    address = property(__address.value, __address.set, None, None)
-
-
-    # Element {http://kolab.org}office-location uses Python identifier office_location
-    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
-
-
-    office_location = property(__office_location.value, __office_location.set, None, None)
-
-
-    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
-    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
-
-
-    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
-
-
-    # Element {http://kolab.org}latitude uses Python identifier latitude
-    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
-
-
-    latitude = property(__latitude.value, __latitude.set, None, None)
-
-
-    # Element {http://kolab.org}job-title uses Python identifier job_title
-    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
-
-
-    job_title = property(__job_title.value, __job_title.set, None, None)
-
-
-    # Element {http://kolab.org}manager-name uses Python identifier manager_name
-    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
-
-
-    manager_name = property(__manager_name.value, __manager_name.set, None, None)
-
-
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}email uses Python identifier email
-    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
-
-
-    email = property(__email.value, __email.set, None, None)
-
-
-    # Element {http://kolab.org}assistant uses Python identifier assistant
-    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
-
-
-    assistant = property(__assistant.value, __assistant.set, None, None)
-
-
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}nick-name uses Python identifier nick_name
-    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
-
-
-    nick_name = property(__nick_name.value, __nick_name.set, None, None)
-
-
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}profession uses Python identifier profession
-    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
-
-
-    profession = property(__profession.value, __profession.set, None, None)
-
-
-    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
-    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
-
-
-    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
-
-
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}birthday uses Python identifier birthday
-    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
-
-
-    birthday = property(__birthday.value, __birthday.set, None, None)
-
-
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}anniversary uses Python identifier anniversary
-    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
-
-
-    anniversary = property(__anniversary.value, __anniversary.set, None, None)
-
-
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}picture uses Python identifier picture
-    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
-
-
-    picture = property(__picture.value, __picture.set, None, None)
-
-
-    # Element {http://kolab.org}name uses Python identifier name
-    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
-
-
-    name = property(__name.value, __name.set, None, None)
-
-
-    # Element {http://kolab.org}department uses Python identifier department
-    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
-
-
-    department = property(__department.value, __department.set, None, None)
-
-
-    # Element {http://kolab.org}children uses Python identifier children
-    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
-
-
-    children = property(__children.value, __children.set, None, None)
-
-
-    # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
-    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
-
-
-    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
-
-
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}gender uses Python identifier gender
-    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
-
-
-    gender = property(__gender.value, __gender.set, None, None)
-
-
-    # Element {http://kolab.org}organization uses Python identifier organization
-    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
-
-
-    organization = property(__organization.value, __organization.set, None, None)
-
-
-    # Element {http://kolab.org}longitude uses Python identifier longitude
-    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
-
-
-    longitude = property(__longitude.value, __longitude.set, None, None)
-
-
-    # Element {http://kolab.org}language uses Python identifier language
-    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
-
-
-    language = property(__language.value, __language.set, None, None)
-
-
-    # Element {http://kolab.org}web-page uses Python identifier web_page
-    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
-
-
-    web_page = property(__web_page.value, __web_page.set, None, None)
-
-
-    # Attribute version inherited from {http://kolab.org}XMLBase
-
-    _ElementMap = XMLBase._ElementMap.copy()
-    _ElementMap.update({
-        __phone.name() : __phone,
-        __im_address.name() : __im_address,
-        __address.name() : __address,
-        __office_location.name() : __office_location,
-        __preferred_address.name() : __preferred_address,
-        __latitude.name() : __latitude,
-        __job_title.name() : __job_title,
-        __manager_name.name() : __manager_name,
-        __email.name() : __email,
-        __assistant.name() : __assistant,
-        __nick_name.name() : __nick_name,
-        __profession.name() : __profession,
-        __spouse_name.name() : __spouse_name,
-        __birthday.name() : __birthday,
-        __anniversary.name() : __anniversary,
-        __picture.name() : __picture,
-        __name.name() : __name,
-        __department.name() : __department,
-        __children.name() : __children,
-        __free_busy_url.name() : __free_busy_url,
-        __gender.name() : __gender,
-        __organization.name() : __organization,
-        __longitude.name() : __longitude,
-        __language.name() : __language,
-        __web_page.name() : __web_page
-    })
-    _AttributeMap = XMLBase._AttributeMap.copy()
-    _AttributeMap.update({
-
-    })
-Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
-
-
-# Complex type CTD_ANON_2 with content type ELEMENT_ONLY
-class CTD_ANON_2 (SMTPContact):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = None
-    # Base type is SMTPContact
-
-    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
-
-    # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
-
-    # Element {http://kolab.org}role uses Python identifier role
-    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_CTD_ANON_2_httpkolab_orgrole', False)
-
-
-    role = property(__role.value, __role.set, None, None)
-
-
-    # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_CTD_ANON_2_httpkolab_orgstatus', False)
-
-
-    status = property(__status.value, __status.set, None, None)
-
-
-    # Element {http://kolab.org}request-response uses Python identifier request_response
-    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_CTD_ANON_2_httpkolab_orgrequest_response', False)
-
-
-    request_response = property(__request_response.value, __request_response.set, None, None)
-
-
-    _ElementMap = SMTPContact._ElementMap.copy()
-    _ElementMap.update({
-        __role.name() : __role,
-        __status.name() : __status,
-        __request_response.name() : __request_response
-    })
-    _AttributeMap = SMTPContact._AttributeMap.copy()
-    _AttributeMap.update({
-
-    })
-
-
-
-# Complex type YearlyRecurrence with content type ELEMENT_ONLY
-class YearlyRecurrence (Recurrence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
-    # Base type is Recurrence
-
-    # Element {http://kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
-
-
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
-
-
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-
-    # Element {http://kolab.org}month uses Python identifier month
-    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
-
-
-    month = property(__month.value, __month.set, None, None)
-
-
-    # Element {http://kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
-
-
-    day = property(__day.value, __day.set, None, None)
-
-
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', STD_ANON, required=True)
-
-    type = property(__type.value, __type.set, None, None)
-
-
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
-
-    cycle = property(__cycle.value, __cycle.set, None, None)
+from pykolab.raw.format import *
 
+import pyxb.utils.domutils
 
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        __daynumber.name() : __daynumber,
-        __month.name() : __month,
-        __day.name() : __day
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __type.name() : __type,
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
-
-
-# Complex type Incidence with content type ELEMENT_ONLY
-class Incidence (XMLBase):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
-    # Base type is XMLBase
-
-    # Element {http://kolab.org}organizer uses Python identifier organizer
-    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
-
-
-    organizer = property(__organizer.value, __organizer.set, None, None)
-
-
-    # Element {http://kolab.org}summary uses Python identifier summary
-    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Incidence_httpkolab_orgsummary', False)
-
-
-    summary = property(__summary.value, __summary.set, None, None)
-
-
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}alarm uses Python identifier alarm
-    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
-
-
-    alarm = property(__alarm.value, __alarm.set, None, None)
-
-
-    # Element {http://kolab.org}location uses Python identifier location
-    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
-
-
-    location = property(__location.value, __location.set, None, None)
-
-
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}creator uses Python identifier creator
-    __creator = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creator'), 'creator', '__httpkolab_org_Incidence_httpkolab_orgcreator', False)
-
-
-    creator = property(__creator.value, __creator.set, None, None)
-
-
-    # Element {http://kolab.org}attendee uses Python identifier attendee
-    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
-
-
-    attendee = property(__attendee.value, __attendee.set, None, None)
-
-
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}recurrence uses Python identifier recurrence
-    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
-
-
-    recurrence = property(__recurrence.value, __recurrence.set, None, None)
-
-
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-
-    # Attribute version inherited from {http://kolab.org}XMLBase
-
-    _ElementMap = XMLBase._ElementMap.copy()
-    _ElementMap.update({
-        __organizer.name() : __organizer,
-        __summary.name() : __summary,
-        __alarm.name() : __alarm,
-        __location.name() : __location,
-        __creator.name() : __creator,
-        __attendee.name() : __attendee,
-        __recurrence.name() : __recurrence
-    })
-    _AttributeMap = XMLBase._AttributeMap.copy()
-    _AttributeMap.update({
-
-    })
-Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
-
-
-# Complex type Event with content type ELEMENT_ONLY
-class Event (Incidence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
-    # Base type is Incidence
-
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
-
-    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
-
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
-
-    # Element {http://kolab.org}end-date uses Python identifier end_date
-    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
-
-
-    end_date = property(__end_date.value, __end_date.set, None, None)
-
-
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
-
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
-    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
-
-
-    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
-
-
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
-
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
-
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
-
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
-
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
-
-
-    start_date = property(__start_date.value, __start_date.set, None, None)
-
-
-    # Element {http://kolab.org}color-label uses Python identifier color_label
-    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
-
-
-    color_label = property(__color_label.value, __color_label.set, None, None)
-
-
-    # Attribute version inherited from {http://kolab.org}XMLBase
-
-    _ElementMap = Incidence._ElementMap.copy()
-    _ElementMap.update({
-        __end_date.name() : __end_date,
-        __show_time_as.name() : __show_time_as,
-        __start_date.name() : __start_date,
-        __color_label.name() : __color_label
-    })
-    _AttributeMap = Incidence._AttributeMap.copy()
-    _AttributeMap.update({
-
-    })
-Namespace.addCategoryObject('typeBinding', u'Event', Event)
-
-
-# Complex type WeeklyRecurrence with content type ELEMENT_ONLY
-class WeeklyRecurrence (Recurrence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
-    # Base type is Recurrence
-
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
-
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'WeeklyRecurrence', WeeklyRecurrence)
-
-
-# Complex type Task with content type ELEMENT_ONLY
-class Task (Incidence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
-    # Base type is Incidence
-
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
-
-    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
-
-    # Element {http://kolab.org}due-date uses Python identifier due_date
-    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
-
-
-    due_date = property(__due_date.value, __due_date.set, None, None)
-
-
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
-
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
-
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}priority uses Python identifier priority
-    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
-
-
-    priority = property(__priority.value, __priority.set, None, None)
-
-
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}parent uses Python identifier parent
-    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
-
-
-    parent = property(__parent.value, __parent.set, None, None)
-
-
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
-
-
-    start_date = property(__start_date.value, __start_date.set, None, None)
-
-
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
-
-    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
-
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-
-    # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
-
-
-    status = property(__status.value, __status.set, None, None)
-
-
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
-
-    # Element {http://kolab.org}completed uses Python identifier completed
-    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
-
-
-    completed = property(__completed.value, __completed.set, None, None)
-
-
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
-
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-
-    # Attribute version inherited from {http://kolab.org}XMLBase
-
-    _ElementMap = Incidence._ElementMap.copy()
-    _ElementMap.update({
-        __due_date.name() : __due_date,
-        __priority.name() : __priority,
-        __parent.name() : __parent,
-        __start_date.name() : __start_date,
-        __status.name() : __status,
-        __completed.name() : __completed
-    })
-    _AttributeMap = Incidence._AttributeMap.copy()
-    _AttributeMap.update({
-
-    })
-Namespace.addCategoryObject('typeBinding', u'Task', Task)
-
-
-note = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'note'), Note)
-Namespace.addCategoryObject('elementBinding', note.name().localName(), note)
-
-contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
-Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
-
-event = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'event'), Event)
-Namespace.addCategoryObject('elementBinding', event.name().localName(), event)
-
-task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
-Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
-
-
-
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
-
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
-SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
-    )
-SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
-
-
-CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
-    )
-CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
-XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
-
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
-
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
-Note._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Note._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'background-color')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'foreground-color')), min_occurs=1, max_occurs=1)
-    )
-Note._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Note._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-Note._ContentModel = pyxb.binding.content.ParticleModel(Note._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
-    )
-PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
-Address._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
-    )
-Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_, scope=Recurrence))
-Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
-
-MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
-MonthlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-MonthlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1)
-    )
-MonthlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-MonthlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
-Name._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
-    )
-Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'office-location'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
-Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'preferred-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'latitude')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'longitude')), min_occurs=1, max_occurs=1)
-    )
-Contact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-CTD_ANON_2._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON_2))
-
-CTD_ANON_2._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON_2))
-
-CTD_ANON_2._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON_2))
-CTD_ANON_2._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
-    )
-CTD_ANON_2._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
-    )
-CTD_ANON_2._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-CTD_ANON_2._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-YearlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'month')), min_occurs=1, max_occurs=1)
-    )
-YearlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON_2, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON, scope=Incidence))
-Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Incidence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
-Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Event._GroupModel_3 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Event._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._GroupModel_2, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._GroupModel_3, min_occurs=1, max_occurs=1)
-    )
-Event._GroupModel_4 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'show-time-as')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'color-label')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'end-date')), min_occurs=1, max_occurs=1)
-    )
-Event._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Event._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._GroupModel_4, min_occurs=1, max_occurs=1)
-    )
-Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_occurs=1, max_occurs=1)
-
-
-WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
-Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._GroupModel_2, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._GroupModel_3, min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_4 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'priority')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'completed')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=0L, max_occurs=1L),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'due-date')), min_occurs=0L, max_occurs=1L),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'parent')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._GroupModel_4, min_occurs=1, max_occurs=1)
-    )
-Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_occurs=1, max_occurs=1)
+pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)
\ No newline at end of file
diff --git a/pykolab/raw/__init__.py b/pykolab/raw/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pykolab/raw/format.py b/pykolab/raw/format.py
new file mode 100644
index 0000000..6b3a5b2
--- /dev/null
+++ b/pykolab/raw/format.py
@@ -0,0 +1,1784 @@
+# ./pykolab/raw/format.py
+# PyXB bindings for NamespaceModule
+# NSM:57793f9fb1566a6e3db3fa9685718c0d26782d75
+# Generated 2011-10-21 14:48:37.851146 by PyXB version 1.1.2
+import pyxb
+import pyxb.binding
+import pyxb.binding.saxer
+import StringIO
+import pyxb.utils.utility
+import pyxb.utils.domutils
+import sys
+
+# Unique identifier for bindings created at the same time
+_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:6062637e-fbeb-11e0-9097-001f3c5996b7')
+
+# Import bindings for namespaces imported into schema
+import pyxb.binding.datatypes
+
+Namespace = pyxb.namespace.NamespaceForURI(u'kolab.org', create_if_missing=True)
+Namespace.configureCategories(['typeBinding', 'elementBinding'])
+ModuleRecord = Namespace.lookupModuleRecordByUID(_GenerationUID, create_if_missing=True)
+ModuleRecord._setModule(sys.modules[__name__])
+
+def CreateFromDocument (xml_text, default_namespace=None, location_base=None):
+    """Parse the given XML and use the document element to create a Python instance."""
+    if pyxb.XMLStyle_saxer != pyxb._XMLStyle:
+        dom = pyxb.utils.domutils.StringToDOM(xml_text)
+        return CreateFromDOM(dom.documentElement)
+    saxer = pyxb.binding.saxer.make_parser(fallback_namespace=Namespace.fallbackNamespace(), location_base=location_base)
+    handler = saxer.getContentHandler()
+    saxer.parse(StringIO.StringIO(xml_text))
+    instance = handler.rootObject()
+    return instance
+
+def CreateFromDOM (node, default_namespace=None):
+    """Create a Python instance from the given DOM node.
+    The node tag must correspond to an element declaration in this module.
+
+    @deprecated: Forcing use of DOM interface is unnecessary; use L{CreateFromDocument}."""
+    if default_namespace is None:
+        default_namespace = Namespace.fallbackNamespace()
+    return pyxb.binding.basis.element.AnyCreateFromDOM(node, _fallback_namespace=default_namespace)
+
+
+# Atomic SimpleTypeDefinition
+class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
+    _Documentation = None
+NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
+NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
+NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
+NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
+NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
+NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
+
+# Atomic SimpleTypeDefinition
+class STD_ANON (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+
+    """An atomic simple type."""
+
+    _ExpandedName = None
+    _Documentation = None
+STD_ANON._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=STD_ANON, enum_prefix=None)
+STD_ANON.monthday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'monthday')
+STD_ANON.yearday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'yearday')
+STD_ANON.weekday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'weekday')
+STD_ANON._InitializeFacetMap(STD_ANON._CF_enumeration)
+
+# Atomic SimpleTypeDefinition
+class UID (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
+    _Documentation = None
+UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
+UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
+UID._InitializeFacetMap(UID._CF_whiteSpace,
+   UID._CF_minLength)
+Namespace.addCategoryObject('typeBinding', u'UID', UID)
+
+# Atomic SimpleTypeDefinition
+class Category (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
+    _Documentation = None
+Category._CF_pattern = pyxb.binding.facets.CF_pattern()
+Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
+Category._InitializeFacetMap(Category._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Category', Category)
+
+# Atomic SimpleTypeDefinition
+class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Sensitivity')
+    _Documentation = None
+Sensitivity._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Sensitivity, enum_prefix=None)
+Sensitivity.private = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'private')
+Sensitivity.confidential = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'confidential')
+Sensitivity.public = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'public')
+Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
+
+# Atomic SimpleTypeDefinition
+class Color (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
+    _Documentation = None
+Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
+Color._CF_pattern = pyxb.binding.facets.CF_pattern()
+Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
+Color._InitializeFacetMap(Color._CF_length,
+   Color._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Color', Color)
+
+# Complex type XMLBase with content type ELEMENT_ONLY
+class XMLBase (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'XMLBase')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {kolab.org}last-modification-date uses Python identifier last_modification_date
+    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__kolab_org_XMLBase_kolab_orglast_modification_date', False)
+
+    
+    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
+
+    
+    # Element {kolab.org}body uses Python identifier body
+    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__kolab_org_XMLBase_kolab_orgbody', False)
+
+    
+    body = property(__body.value, __body.set, None, None)
+
+    
+    # Element {kolab.org}categories uses Python identifier categories
+    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__kolab_org_XMLBase_kolab_orgcategories', False)
+
+    
+    categories = property(__categories.value, __categories.set, None, None)
+
+    
+    # Element {kolab.org}inline-attachment uses Python identifier inline_attachment
+    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__kolab_org_XMLBase_kolab_orginline_attachment', True)
+
+    
+    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+
+    
+    # Element {kolab.org}creation-date uses Python identifier creation_date
+    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__kolab_org_XMLBase_kolab_orgcreation_date', False)
+
+    
+    creation_date = property(__creation_date.value, __creation_date.set, None, None)
+
+    
+    # Element {kolab.org}link-attachment uses Python identifier link_attachment
+    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__kolab_org_XMLBase_kolab_orglink_attachment', True)
+
+    
+    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
+
+    
+    # Element {kolab.org}uid uses Python identifier uid
+    __uid = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'uid'), 'uid', '__kolab_org_XMLBase_kolab_orguid', False)
+
+    
+    uid = property(__uid.value, __uid.set, None, None)
+
+    
+    # Element {kolab.org}product-id uses Python identifier product_id
+    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__kolab_org_XMLBase_kolab_orgproduct_id', False)
+
+    
+    product_id = property(__product_id.value, __product_id.set, None, None)
+
+    
+    # Element {kolab.org}sensitivity uses Python identifier sensitivity
+    __sensitivity = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), 'sensitivity', '__kolab_org_XMLBase_kolab_orgsensitivity', False)
+
+    
+    sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
+
+    
+    # Attribute version uses Python identifier version
+    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__kolab_org_XMLBase_version', pyxb.binding.datatypes.double)
+    
+    version = property(__version.value, __version.set, None, None)
+
+
+    _ElementMap = {
+        __last_modification_date.name() : __last_modification_date,
+        __body.name() : __body,
+        __categories.name() : __categories,
+        __inline_attachment.name() : __inline_attachment,
+        __creation_date.name() : __creation_date,
+        __link_attachment.name() : __link_attachment,
+        __uid.name() : __uid,
+        __product_id.name() : __product_id,
+        __sensitivity.name() : __sensitivity
+    }
+    _AttributeMap = {
+        __version.name() : __version
+    }
+Namespace.addCategoryObject('typeBinding', u'XMLBase', XMLBase)
+
+
+# Complex type Contact with content type ELEMENT_ONLY
+class Contact (XMLBase):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    # Base type is XMLBase
+    
+    # Element {kolab.org}phone uses Python identifier phone
+    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__kolab_org_Contact_kolab_orgphone', True)
+
+    
+    phone = property(__phone.value, __phone.set, None, None)
+
+    
+    # Element {kolab.org}email uses Python identifier email
+    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__kolab_org_Contact_kolab_orgemail', True)
+
+    
+    email = property(__email.value, __email.set, None, None)
+
+    
+    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}address uses Python identifier address
+    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__kolab_org_Contact_kolab_orgaddress', True)
+
+    
+    address = property(__address.value, __address.set, None, None)
+
+    
+    # Element {kolab.org}preferred-address uses Python identifier preferred_address
+    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__kolab_org_Contact_kolab_orgpreferred_address', False)
+
+    
+    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
+
+    
+    # Element {kolab.org}office-location uses Python identifier office_location
+    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__kolab_org_Contact_kolab_orgoffice_location', False)
+
+    
+    office_location = property(__office_location.value, __office_location.set, None, None)
+
+    
+    # Element {kolab.org}latitude uses Python identifier latitude
+    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__kolab_org_Contact_kolab_orglatitude', False)
+
+    
+    latitude = property(__latitude.value, __latitude.set, None, None)
+
+    
+    # Element {kolab.org}job-title uses Python identifier job_title
+    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__kolab_org_Contact_kolab_orgjob_title', False)
+
+    
+    job_title = property(__job_title.value, __job_title.set, None, None)
+
+    
+    # Element {kolab.org}manager-name uses Python identifier manager_name
+    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__kolab_org_Contact_kolab_orgmanager_name', False)
+
+    
+    manager_name = property(__manager_name.value, __manager_name.set, None, None)
+
+    
+    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}im-address uses Python identifier im_address
+    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__kolab_org_Contact_kolab_orgim_address', False)
+
+    
+    im_address = property(__im_address.value, __im_address.set, None, None)
+
+    
+    # Element {kolab.org}assistant uses Python identifier assistant
+    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__kolab_org_Contact_kolab_orgassistant', False)
+
+    
+    assistant = property(__assistant.value, __assistant.set, None, None)
+
+    
+    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}nick-name uses Python identifier nick_name
+    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__kolab_org_Contact_kolab_orgnick_name', False)
+
+    
+    nick_name = property(__nick_name.value, __nick_name.set, None, None)
+
+    
+    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}profession uses Python identifier profession
+    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__kolab_org_Contact_kolab_orgprofession', False)
+
+    
+    profession = property(__profession.value, __profession.set, None, None)
+
+    
+    # Element {kolab.org}spouse-name uses Python identifier spouse_name
+    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__kolab_org_Contact_kolab_orgspouse_name', False)
+
+    
+    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
+
+    
+    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}birthday uses Python identifier birthday
+    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__kolab_org_Contact_kolab_orgbirthday', False)
+
+    
+    birthday = property(__birthday.value, __birthday.set, None, None)
+
+    
+    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}anniversary uses Python identifier anniversary
+    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__kolab_org_Contact_kolab_organniversary', False)
+
+    
+    anniversary = property(__anniversary.value, __anniversary.set, None, None)
+
+    
+    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}name uses Python identifier name
+    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__kolab_org_Contact_kolab_orgname', False)
+
+    
+    name = property(__name.value, __name.set, None, None)
+
+    
+    # Element {kolab.org}picture uses Python identifier picture
+    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__kolab_org_Contact_kolab_orgpicture', False)
+
+    
+    picture = property(__picture.value, __picture.set, None, None)
+
+    
+    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}department uses Python identifier department
+    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__kolab_org_Contact_kolab_orgdepartment', False)
+
+    
+    department = property(__department.value, __department.set, None, None)
+
+    
+    # Element {kolab.org}children uses Python identifier children
+    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__kolab_org_Contact_kolab_orgchildren', False)
+
+    
+    children = property(__children.value, __children.set, None, None)
+
+    
+    # Element {kolab.org}free-busy-url uses Python identifier free_busy_url
+    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__kolab_org_Contact_kolab_orgfree_busy_url', False)
+
+    
+    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
+
+    
+    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}gender uses Python identifier gender
+    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__kolab_org_Contact_kolab_orggender', False)
+
+    
+    gender = property(__gender.value, __gender.set, None, None)
+
+    
+    # Element {kolab.org}organization uses Python identifier organization
+    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__kolab_org_Contact_kolab_orgorganization', False)
+
+    
+    organization = property(__organization.value, __organization.set, None, None)
+
+    
+    # Element {kolab.org}longitude uses Python identifier longitude
+    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__kolab_org_Contact_kolab_orglongitude', False)
+
+    
+    longitude = property(__longitude.value, __longitude.set, None, None)
+
+    
+    # Element {kolab.org}language uses Python identifier language
+    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__kolab_org_Contact_kolab_orglanguage', False)
+
+    
+    language = property(__language.value, __language.set, None, None)
+
+    
+    # Element {kolab.org}web-page uses Python identifier web_page
+    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__kolab_org_Contact_kolab_orgweb_page', False)
+
+    
+    web_page = property(__web_page.value, __web_page.set, None, None)
+
+    
+    # Attribute version inherited from {kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __phone.name() : __phone,
+        __email.name() : __email,
+        __address.name() : __address,
+        __preferred_address.name() : __preferred_address,
+        __office_location.name() : __office_location,
+        __latitude.name() : __latitude,
+        __job_title.name() : __job_title,
+        __manager_name.name() : __manager_name,
+        __im_address.name() : __im_address,
+        __assistant.name() : __assistant,
+        __nick_name.name() : __nick_name,
+        __profession.name() : __profession,
+        __spouse_name.name() : __spouse_name,
+        __birthday.name() : __birthday,
+        __anniversary.name() : __anniversary,
+        __name.name() : __name,
+        __picture.name() : __picture,
+        __department.name() : __department,
+        __children.name() : __children,
+        __free_busy_url.name() : __free_busy_url,
+        __gender.name() : __gender,
+        __organization.name() : __organization,
+        __longitude.name() : __longitude,
+        __language.name() : __language,
+        __web_page.name() : __web_page
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
+
+
+# Complex type Recurrence with content type ELEMENT_ONLY
+class Recurrence (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {kolab.org}exclusion uses Python identifier exclusion
+    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__kolab_org_Recurrence_kolab_orgexclusion', True)
+
+    
+    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+
+    
+    # Element {kolab.org}interval uses Python identifier interval
+    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__kolab_org_Recurrence_kolab_orginterval', False)
+
+    
+    interval = property(__interval.value, __interval.set, None, None)
+
+    
+    # Element {kolab.org}rangetype uses Python identifier rangetype
+    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__kolab_org_Recurrence_kolab_orgrangetype', False)
+
+    
+    rangetype = property(__rangetype.value, __rangetype.set, None, None)
+
+
+    _ElementMap = {
+        __exclusion.name() : __exclusion,
+        __interval.name() : __interval,
+        __rangetype.name() : __rangetype
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+
+
+# Complex type YearlyRecurrence with content type ELEMENT_ONLY
+class YearlyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
+    # Base type is Recurrence
+    
+    # Element {kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__kolab_org_YearlyRecurrence_kolab_orgdaynumber', False)
+
+    
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+
+    
+    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    
+    # Element {kolab.org}month uses Python identifier month
+    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__kolab_org_YearlyRecurrence_kolab_orgmonth', False)
+
+    
+    month = property(__month.value, __month.set, None, None)
+
+    
+    # Element {kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__kolab_org_YearlyRecurrence_kolab_orgday', False)
+
+    
+    day = property(__day.value, __day.set, None, None)
+
+    
+    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    
+    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_YearlyRecurrence_type', STD_ANON, required=True)
+    
+    type = property(__type.value, __type.set, None, None)
+
+    
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        __daynumber.name() : __daynumber,
+        __month.name() : __month,
+        __day.name() : __day
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __type.name() : __type,
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
+
+
+# Complex type Incidence with content type ELEMENT_ONLY
+class Incidence (XMLBase):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
+    # Base type is XMLBase
+    
+    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    
+    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}recurrence uses Python identifier recurrence
+    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__kolab_org_Incidence_kolab_orgrecurrence', False)
+
+    
+    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+
+    
+    # Element {kolab.org}organizer uses Python identifier organizer
+    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__kolab_org_Incidence_kolab_orgorganizer', False)
+
+    
+    organizer = property(__organizer.value, __organizer.set, None, None)
+
+    
+    # Element {kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__kolab_org_Incidence_kolab_orgsummary', False)
+
+    
+    summary = property(__summary.value, __summary.set, None, None)
+
+    
+    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}alarm uses Python identifier alarm
+    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__kolab_org_Incidence_kolab_orgalarm', False)
+
+    
+    alarm = property(__alarm.value, __alarm.set, None, None)
+
+    
+    # Element {kolab.org}location uses Python identifier location
+    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__kolab_org_Incidence_kolab_orglocation', False)
+
+    
+    location = property(__location.value, __location.set, None, None)
+
+    
+    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    
+    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    
+    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}attendee uses Python identifier attendee
+    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__kolab_org_Incidence_kolab_orgattendee', False)
+
+    
+    attendee = property(__attendee.value, __attendee.set, None, None)
+
+    
+    # Element {kolab.org}creator uses Python identifier creator
+    __creator = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creator'), 'creator', '__kolab_org_Incidence_kolab_orgcreator', False)
+
+    
+    creator = property(__creator.value, __creator.set, None, None)
+
+    
+    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    
+    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    
+    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    
+    # Attribute version inherited from {kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __recurrence.name() : __recurrence,
+        __organizer.name() : __organizer,
+        __summary.name() : __summary,
+        __alarm.name() : __alarm,
+        __location.name() : __location,
+        __attendee.name() : __attendee,
+        __creator.name() : __creator
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
+
+
+# Complex type Event with content type ELEMENT_ONLY
+class Event (Incidence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
+    # Base type is Incidence
+    
+    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}end-date uses Python identifier end_date
+    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__kolab_org_Event_kolab_orgend_date', False)
+
+    
+    end_date = property(__end_date.value, __end_date.set, None, None)
+
+    
+    # Element recurrence ({kolab.org}recurrence) inherited from {kolab.org}Incidence
+    
+    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__kolab_org_Event_kolab_orgstart_date', False)
+
+    
+    start_date = property(__start_date.value, __start_date.set, None, None)
+
+    
+    # Element summary ({kolab.org}summary) inherited from {kolab.org}Incidence
+    
+    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element organizer ({kolab.org}organizer) inherited from {kolab.org}Incidence
+    
+    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    
+    # Element location ({kolab.org}location) inherited from {kolab.org}Incidence
+    
+    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    
+    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element alarm ({kolab.org}alarm) inherited from {kolab.org}Incidence
+    
+    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}color-label uses Python identifier color_label
+    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__kolab_org_Event_kolab_orgcolor_label', False)
+
+    
+    color_label = property(__color_label.value, __color_label.set, None, None)
+
+    
+    # Element attendee ({kolab.org}attendee) inherited from {kolab.org}Incidence
+    
+    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    
+    # Element creator ({kolab.org}creator) inherited from {kolab.org}Incidence
+    
+    # Element {kolab.org}show-time-as uses Python identifier show_time_as
+    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__kolab_org_Event_kolab_orgshow_time_as', False)
+
+    
+    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
+
+    
+    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    
+    # Attribute version inherited from {kolab.org}XMLBase
+
+    _ElementMap = Incidence._ElementMap.copy()
+    _ElementMap.update({
+        __end_date.name() : __end_date,
+        __start_date.name() : __start_date,
+        __color_label.name() : __color_label,
+        __show_time_as.name() : __show_time_as
+    })
+    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Event', Event)
+
+
+# Complex type Name with content type ELEMENT_ONLY
+class Name (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {kolab.org}prefix uses Python identifier prefix
+    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__kolab_org_Name_kolab_orgprefix', False)
+
+    
+    prefix = property(__prefix.value, __prefix.set, None, None)
+
+    
+    # Element {kolab.org}suffix uses Python identifier suffix
+    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__kolab_org_Name_kolab_orgsuffix', False)
+
+    
+    suffix = property(__suffix.value, __suffix.set, None, None)
+
+    
+    # Element {kolab.org}last-name uses Python identifier last_name
+    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__kolab_org_Name_kolab_orglast_name', False)
+
+    
+    last_name = property(__last_name.value, __last_name.set, None, None)
+
+    
+    # Element {kolab.org}initials uses Python identifier initials
+    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__kolab_org_Name_kolab_orginitials', False)
+
+    
+    initials = property(__initials.value, __initials.set, None, None)
+
+    
+    # Element {kolab.org}full-name uses Python identifier full_name
+    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__kolab_org_Name_kolab_orgfull_name', False)
+
+    
+    full_name = property(__full_name.value, __full_name.set, None, None)
+
+    
+    # Element {kolab.org}given-name uses Python identifier given_name
+    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__kolab_org_Name_kolab_orggiven_name', False)
+
+    
+    given_name = property(__given_name.value, __given_name.set, None, None)
+
+    
+    # Element {kolab.org}middle-names uses Python identifier middle_names
+    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__kolab_org_Name_kolab_orgmiddle_names', False)
+
+    
+    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+
+
+    _ElementMap = {
+        __prefix.name() : __prefix,
+        __suffix.name() : __suffix,
+        __last_name.name() : __last_name,
+        __initials.name() : __initials,
+        __full_name.name() : __full_name,
+        __given_name.name() : __given_name,
+        __middle_names.name() : __middle_names
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Name', Name)
+
+
+# Complex type SMTPContact with content type ELEMENT_ONLY
+class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {kolab.org}smtp-address uses Python identifier smtp_address
+    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__kolab_org_SMTPContact_kolab_orgsmtp_address', False)
+
+    
+    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+
+    
+    # Element {kolab.org}display-name uses Python identifier display_name
+    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__kolab_org_SMTPContact_kolab_orgdisplay_name', False)
+
+    
+    display_name = property(__display_name.value, __display_name.set, None, None)
+
+
+    _ElementMap = {
+        __smtp_address.name() : __smtp_address,
+        __display_name.name() : __display_name
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
+
+
+# Complex type CTD_ANON with content type ELEMENT_ONLY
+class CTD_ANON (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = None
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_CTD_ANON_cycle', pyxb.binding.datatypes.string)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+    _HasWildcardElement = True
+
+    _ElementMap = {
+        
+    }
+    _AttributeMap = {
+        __cycle.name() : __cycle
+    }
+
+
+
+# Complex type CTD_ANON_ with content type ELEMENT_ONLY
+class CTD_ANON_ (SMTPContact):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = None
+    # Base type is SMTPContact
+    
+    # Element smtp_address ({kolab.org}smtp-address) inherited from {kolab.org}SMTPContact
+    
+    # Element display_name ({kolab.org}display-name) inherited from {kolab.org}SMTPContact
+    
+    # Element {kolab.org}request-response uses Python identifier request_response
+    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__kolab_org_CTD_ANON__kolab_orgrequest_response', False)
+
+    
+    request_response = property(__request_response.value, __request_response.set, None, None)
+
+    
+    # Element {kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__kolab_org_CTD_ANON__kolab_orgstatus', False)
+
+    
+    status = property(__status.value, __status.set, None, None)
+
+    
+    # Element {kolab.org}role uses Python identifier role
+    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__kolab_org_CTD_ANON__kolab_orgrole', False)
+
+    
+    role = property(__role.value, __role.set, None, None)
+
+
+    _ElementMap = SMTPContact._ElementMap.copy()
+    _ElementMap.update({
+        __request_response.name() : __request_response,
+        __status.name() : __status,
+        __role.name() : __role
+    })
+    _AttributeMap = SMTPContact._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+
+
+
+# Complex type Note with content type ELEMENT_ONLY
+class Note (XMLBase):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Note')
+    # Base type is XMLBase
+    
+    # Element {kolab.org}background-color uses Python identifier background_color
+    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__kolab_org_Note_kolab_orgbackground_color', False)
+
+    
+    background_color = property(__background_color.value, __background_color.set, None, None)
+
+    
+    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    
+    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}foreground-color uses Python identifier foreground_color
+    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__kolab_org_Note_kolab_orgforeground_color', False)
+
+    
+    foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
+
+    
+    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    
+    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    
+    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__kolab_org_Note_kolab_orgsummary', False)
+
+    
+    summary = property(__summary.value, __summary.set, None, None)
+
+    
+    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    
+    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    
+    # Attribute version inherited from {kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __background_color.name() : __background_color,
+        __foreground_color.name() : __foreground_color,
+        __summary.name() : __summary
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Note', Note)
+
+
+# Complex type PhoneNumber with content type ELEMENT_ONLY
+class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {kolab.org}number uses Python identifier number
+    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__kolab_org_PhoneNumber_kolab_orgnumber', False)
+
+    
+    number = property(__number.value, __number.set, None, None)
+
+    
+    # Element {kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__kolab_org_PhoneNumber_kolab_orgtype', False)
+
+    
+    type = property(__type.value, __type.set, None, None)
+
+
+    _ElementMap = {
+        __number.name() : __number,
+        __type.name() : __type
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
+
+
+# Complex type CTD_ANON_2 with content type EMPTY
+class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
+    _Abstract = False
+    _ExpandedName = None
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_CTD_ANON_2_type', pyxb.binding.datatypes.string)
+    
+    type = property(__type.value, __type.set, None, None)
+
+
+    _ElementMap = {
+        
+    }
+    _AttributeMap = {
+        __type.name() : __type
+    }
+
+
+
+# Complex type Address with content type ELEMENT_ONLY
+class Address (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__kolab_org_Address_kolab_orgtype', False)
+
+    
+    type = property(__type.value, __type.set, None, None)
+
+    
+    # Element {kolab.org}postal-code uses Python identifier postal_code
+    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__kolab_org_Address_kolab_orgpostal_code', False)
+
+    
+    postal_code = property(__postal_code.value, __postal_code.set, None, None)
+
+    
+    # Element {kolab.org}street uses Python identifier street
+    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__kolab_org_Address_kolab_orgstreet', False)
+
+    
+    street = property(__street.value, __street.set, None, None)
+
+    
+    # Element {kolab.org}locality uses Python identifier locality
+    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__kolab_org_Address_kolab_orglocality', False)
+
+    
+    locality = property(__locality.value, __locality.set, None, None)
+
+    
+    # Element {kolab.org}country uses Python identifier country
+    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__kolab_org_Address_kolab_orgcountry', False)
+
+    
+    country = property(__country.value, __country.set, None, None)
+
+    
+    # Element {kolab.org}region uses Python identifier region
+    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__kolab_org_Address_kolab_orgregion', False)
+
+    
+    region = property(__region.value, __region.set, None, None)
+
+
+    _ElementMap = {
+        __type.name() : __type,
+        __postal_code.name() : __postal_code,
+        __street.name() : __street,
+        __locality.name() : __locality,
+        __country.name() : __country,
+        __region.name() : __region
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Address', Address)
+
+
+# Complex type DailyRecurrence with content type ELEMENT_ONLY
+class DailyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    # Base type is Recurrence
+    
+    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    
+    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    
+    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
+
+
+# Complex type MonthlyRecurrence with content type ELEMENT_ONLY
+class MonthlyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
+    # Base type is Recurrence
+    
+    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    
+    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    
+    # Element {kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__kolab_org_MonthlyRecurrence_kolab_orgday', False)
+
+    
+    day = property(__day.value, __day.set, None, None)
+
+    
+    # Element {kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__kolab_org_MonthlyRecurrence_kolab_orgdaynumber', False)
+
+    
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+
+    
+    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
+    
+    type = property(__type.value, __type.set, None, None)
+
+    
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_MonthlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'monthly', required=True)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        __day.name() : __day,
+        __daynumber.name() : __daynumber
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __type.name() : __type,
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'MonthlyRecurrence', MonthlyRecurrence)
+
+
+# Complex type WeeklyRecurrence with content type ELEMENT_ONLY
+class WeeklyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
+    # Base type is Recurrence
+    
+    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    
+    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    
+    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'WeeklyRecurrence', WeeklyRecurrence)
+
+
+# Complex type Task with content type ELEMENT_ONLY
+class Task (Incidence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
+    # Base type is Incidence
+    
+    # Element organizer ({kolab.org}organizer) inherited from {kolab.org}Incidence
+    
+    # Element alarm ({kolab.org}alarm) inherited from {kolab.org}Incidence
+    
+    # Element recurrence ({kolab.org}recurrence) inherited from {kolab.org}Incidence
+    
+    # Element location ({kolab.org}location) inherited from {kolab.org}Incidence
+    
+    # Element {kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__kolab_org_Task_kolab_orgstart_date', False)
+
+    
+    start_date = property(__start_date.value, __start_date.set, None, None)
+
+    
+    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    
+    # Element attendee ({kolab.org}attendee) inherited from {kolab.org}Incidence
+    
+    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}due-date uses Python identifier due_date
+    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__kolab_org_Task_kolab_orgdue_date', False)
+
+    
+    due_date = property(__due_date.value, __due_date.set, None, None)
+
+    
+    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}parent uses Python identifier parent
+    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__kolab_org_Task_kolab_orgparent', False)
+
+    
+    parent = property(__parent.value, __parent.set, None, None)
+
+    
+    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    
+    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    
+    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}priority uses Python identifier priority
+    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__kolab_org_Task_kolab_orgpriority', False)
+
+    
+    priority = property(__priority.value, __priority.set, None, None)
+
+    
+    # Element summary ({kolab.org}summary) inherited from {kolab.org}Incidence
+    
+    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}completed uses Python identifier completed
+    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__kolab_org_Task_kolab_orgcompleted', False)
+
+    
+    completed = property(__completed.value, __completed.set, None, None)
+
+    
+    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    
+    # Element {kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__kolab_org_Task_kolab_orgstatus', False)
+
+    
+    status = property(__status.value, __status.set, None, None)
+
+    
+    # Element creator ({kolab.org}creator) inherited from {kolab.org}Incidence
+    
+    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    
+    # Attribute version inherited from {kolab.org}XMLBase
+
+    _ElementMap = Incidence._ElementMap.copy()
+    _ElementMap.update({
+        __start_date.name() : __start_date,
+        __due_date.name() : __due_date,
+        __parent.name() : __parent,
+        __priority.name() : __priority,
+        __completed.name() : __completed,
+        __status.name() : __status
+    })
+    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Task', Task)
+
+
+contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
+Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
+
+event = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'event'), Event)
+Namespace.addCategoryObject('elementBinding', event.name().localName(), event)
+
+note = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'note'), Note)
+Namespace.addCategoryObject('elementBinding', note.name().localName(), note)
+
+task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
+Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
+
+
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
+XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'office-location'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'preferred-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'latitude')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'longitude')), min_occurs=1, max_occurs=1)
+    )
+Contact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_2, scope=Recurrence))
+Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+YearlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'month')), min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON_, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
+Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
+Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_3 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._GroupModel_2, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._GroupModel_3, min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_4 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'show-time-as')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'color-label')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'end-date')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._GroupModel_4, min_occurs=1, max_occurs=1)
+    )
+Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
+Name._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
+    )
+Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
+SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+    )
+SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+
+
+CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
+    )
+CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
+
+CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
+
+CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
+CTD_ANON_._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON_._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON_._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+CTD_ANON_._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
+Note._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Note._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'background-color')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'foreground-color')), min_occurs=1, max_occurs=1)
+    )
+Note._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Note._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Note._ContentModel = pyxb.binding.content.ParticleModel(Note._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
+    )
+PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
+Address._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
+    )
+Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
+
+
+DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+MonthlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+MonthlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1)
+    )
+MonthlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+MonthlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
+Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_2, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_3, min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_4 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'priority')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'completed')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'due-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'parent')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_4, min_occurs=1, max_occurs=1)
+    )
+Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_occurs=1, max_occurs=1)


commit 78ff024a9b2d66a4c1fa393952b35c631b9f1308
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 21 14:51:18 2011 +0100

    Generate the bindings in raw form, so pykolab.format is clean and open for modifications based on the pykolab.raw.format library

diff --git a/Makefile.am b/Makefile.am
index 506307d..2634a9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ rpm: srpm
 
 bindings:
 	@rm -rf pykolab/format.py*
-	@pyxbgen --module-prefix=pykolab -u schemas/base.xsd -u schemas/contact.xsd -u schemas/event.xsd -u schemas/incidence.xsd schemas/note.xsd schemas/task.xsd -m format
+	@pyxbgen --module-prefix=pykolab -u schemas/base.xsd -u schemas/contact.xsd -u schemas/event.xsd -u schemas/incidence.xsd schemas/note.xsd schemas/task.xsd -m format -r
 
 clean:
 	find -type f -name "*.pyo" -o -name "*.pyc" -delete


commit e814633793598bfb1664193e9b0b7ec400e40991
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 21 14:40:56 2011 +0100

    Add the bare layout for a Python module generated from XSDs by pyxbgen

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..506307d
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,41 @@
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
+
+INTLTOOL_FILES = \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
+
+EXTRA_DIST = \
+	AUTHORS \
+	ChangeLog \
+	COPYING \
+	INSTALL \
+	NEWS \
+	README
+
+SUBDIRS = \
+	pykolab
+
+tarball:
+	git stash
+	make dist
+
+ChangeLog:
+	(GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+srpm: ChangeLog dist
+	@rpmbuild -ts $(PACKAGE)-$(VERSION).tar.gz
+
+rpm: srpm
+	@rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+
+bindings:
+	@rm -rf pykolab/format.py*
+	@pyxbgen --module-prefix=pykolab -u schemas/base.xsd -u schemas/contact.xsd -u schemas/event.xsd -u schemas/incidence.xsd schemas/note.xsd schemas/task.xsd -m format
+
+clean:
+	find -type f -name "*.pyo" -o -name "*.pyc" -delete
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..18688ae
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,25 @@
+AC_INIT([pykolab-format], 0.1)
+AC_SUBST([RELEASE], 0.1)
+
+AC_CONFIG_SRCDIR(pykolab/__init__.py)
+
+ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl or pa pl pt pt_BR ru sk sl sr at latin sr sv ta tr uk zh_CN zh_TW"
+
+AM_INIT_AUTOMAKE
+AM_MAINTAINER_MODE
+AM_PATH_PYTHON
+
+GETTEXT_PACKAGE=pykolab-format
+AC_SUBST(GETTEXT_PACKAGE)
+AM_GLIB_GNU_GETTEXT
+AC_PROG_INTLTOOL
+AC_PROG_LN_S
+
+AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`)
+
+AC_CONFIG_FILES([
+Makefile
+pykolab-format.spec
+])
+
+AC_OUTPUT
diff --git a/install-sh b/install-sh
new file mode 100755
index 0000000..6781b98
--- /dev/null
+++ b/install-sh
@@ -0,0 +1,520 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2009-04-28.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dst_arg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/intltool-extract.in b/intltool-extract.in
new file mode 100644
index 0000000..e69de29
diff --git a/intltool-merge.in b/intltool-merge.in
new file mode 100644
index 0000000..e69de29
diff --git a/intltool-update.in b/intltool-update.in
new file mode 100644
index 0000000..e69de29
diff --git a/missing b/missing
new file mode 100755
index 0000000..28055d2
--- /dev/null
+++ b/missing
@@ -0,0 +1,376 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake at gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar*)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te*)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison*|yacc*)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex*|flex*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit $?
+    fi
+    ;;
+
+  makeinfo*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar*)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 0000000..cc8a222
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,217 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob at ximian.com> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p at .
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && gencat $@ $*.msg
+
+
+all: all- at USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
+install-data: install-data- at USE_NLS@
+install-data-no: all
+install-data-yes: all
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	  fi; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  else \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+
+# Empty stubs to satisfy archaic automake needs
+dvi info ctags tags CTAGS TAGS ID:
+
+# Define this as empty until I found a useful application.
+install-exec installcheck:
+
+uninstall:
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	done
+
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
+
+mostlyclean:
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
+	for file in $$dists; do \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  echo "$$lang:"; \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$lang.gmo failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
+
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..e69de29
diff --git a/pykolab-format.spec.in b/pykolab-format.spec.in
new file mode 100644
index 0000000..e69de29
diff --git a/pykolab/__init__.py b/pykolab/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pykolab/format.py b/pykolab/format.py
new file mode 100644
index 0000000..94990ff
--- /dev/null
+++ b/pykolab/format.py
@@ -0,0 +1,1786 @@
+# ./pykolab/format.py
+# PyXB bindings for NamespaceModule
+# NSM:627e20d8ff2455aff19af8f568d2295daed9a405
+# Generated 2011-10-21 13:49:31.742437 by PyXB version 1.1.2
+import pyxb
+import pyxb.binding
+import pyxb.binding.saxer
+import StringIO
+import pyxb.utils.utility
+import pyxb.utils.domutils
+import sys
+
+# Unique identifier for bindings created at the same time
+_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:1eb97ad2-fbe3-11e0-af2c-001f3c5996b7')
+
+# Import bindings for namespaces imported into schema
+import pyxb.binding.datatypes
+
+Namespace = pyxb.namespace.NamespaceForURI(u'http://kolab.org', create_if_missing=True)
+Namespace.configureCategories(['typeBinding', 'elementBinding'])
+ModuleRecord = Namespace.lookupModuleRecordByUID(_GenerationUID, create_if_missing=True)
+ModuleRecord._setModule(sys.modules[__name__])
+
+pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)
+
+def CreateFromDocument (xml_text, default_namespace=None, location_base=None):
+    """Parse the given XML and use the document element to create a Python instance."""
+    if pyxb.XMLStyle_saxer != pyxb._XMLStyle:
+        dom = pyxb.utils.domutils.StringToDOM(xml_text)
+        return CreateFromDOM(dom.documentElement)
+    saxer = pyxb.binding.saxer.make_parser(fallback_namespace=Namespace.fallbackNamespace(), location_base=location_base)
+    handler = saxer.getContentHandler()
+    saxer.parse(StringIO.StringIO(xml_text))
+    instance = handler.rootObject()
+    return instance
+
+def CreateFromDOM (node, default_namespace=None):
+    """Create a Python instance from the given DOM node.
+    The node tag must correspond to an element declaration in this module.
+
+    @deprecated: Forcing use of DOM interface is unnecessary; use L{CreateFromDocument}."""
+    if default_namespace is None:
+        default_namespace = Namespace.fallbackNamespace()
+    return pyxb.binding.basis.element.AnyCreateFromDOM(node, _fallback_namespace=default_namespace)
+
+
+# Atomic SimpleTypeDefinition
+class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
+    _Documentation = None
+NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
+NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
+NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
+NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
+NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
+NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
+
+# Atomic SimpleTypeDefinition
+class STD_ANON (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+
+    """An atomic simple type."""
+
+    _ExpandedName = None
+    _Documentation = None
+STD_ANON._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=STD_ANON, enum_prefix=None)
+STD_ANON.monthday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'monthday')
+STD_ANON.yearday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'yearday')
+STD_ANON.weekday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'weekday')
+STD_ANON._InitializeFacetMap(STD_ANON._CF_enumeration)
+
+# Atomic SimpleTypeDefinition
+class UID (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
+    _Documentation = None
+UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
+UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
+UID._InitializeFacetMap(UID._CF_whiteSpace,
+   UID._CF_minLength)
+Namespace.addCategoryObject('typeBinding', u'UID', UID)
+
+# Atomic SimpleTypeDefinition
+class Category (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
+    _Documentation = None
+Category._CF_pattern = pyxb.binding.facets.CF_pattern()
+Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
+Category._InitializeFacetMap(Category._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Category', Category)
+
+# Atomic SimpleTypeDefinition
+class Color (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
+    _Documentation = None
+Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
+Color._CF_pattern = pyxb.binding.facets.CF_pattern()
+Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
+Color._InitializeFacetMap(Color._CF_length,
+   Color._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Color', Color)
+
+# Atomic SimpleTypeDefinition
+class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Sensitivity')
+    _Documentation = None
+Sensitivity._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Sensitivity, enum_prefix=None)
+Sensitivity.private = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'private')
+Sensitivity.confidential = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'confidential')
+Sensitivity.public = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'public')
+Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
+
+# Complex type SMTPContact with content type ELEMENT_ONLY
+class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
+    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
+
+
+    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+
+
+    # Element {http://kolab.org}display-name uses Python identifier display_name
+    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
+
+
+    display_name = property(__display_name.value, __display_name.set, None, None)
+
+
+    _ElementMap = {
+        __smtp_address.name() : __smtp_address,
+        __display_name.name() : __display_name
+    }
+    _AttributeMap = {
+
+    }
+Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
+
+
+# Complex type CTD_ANON with content type ELEMENT_ONLY
+class CTD_ANON (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = None
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_CTD_ANON_cycle', pyxb.binding.datatypes.string)
+
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+    _HasWildcardElement = True
+
+    _ElementMap = {
+
+    }
+    _AttributeMap = {
+        __cycle.name() : __cycle
+    }
+
+
+
+# Complex type XMLBase with content type ELEMENT_ONLY
+class XMLBase (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'XMLBase')
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Element {http://kolab.org}body uses Python identifier body
+    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
+
+
+    body = property(__body.value, __body.set, None, None)
+
+
+    # Element {http://kolab.org}product-id uses Python identifier product_id
+    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
+
+
+    product_id = property(__product_id.value, __product_id.set, None, None)
+
+
+    # Element {http://kolab.org}categories uses Python identifier categories
+    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
+
+
+    categories = property(__categories.value, __categories.set, None, None)
+
+
+    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
+    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
+
+
+    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+
+
+    # Element {http://kolab.org}link-attachment uses Python identifier link_attachment
+    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__httpkolab_org_XMLBase_httpkolab_orglink_attachment', True)
+
+
+    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
+
+
+    # Element {http://kolab.org}creation-date uses Python identifier creation_date
+    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
+
+
+    creation_date = property(__creation_date.value, __creation_date.set, None, None)
+
+
+    # Element {http://kolab.org}sensitivity uses Python identifier sensitivity
+    __sensitivity = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), 'sensitivity', '__httpkolab_org_XMLBase_httpkolab_orgsensitivity', False)
+
+
+    sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
+
+
+    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
+    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
+
+
+    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
+
+
+    # Element {http://kolab.org}uid uses Python identifier uid
+    __uid = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'uid'), 'uid', '__httpkolab_org_XMLBase_httpkolab_orguid', False)
+
+
+    uid = property(__uid.value, __uid.set, None, None)
+
+
+    # Attribute version uses Python identifier version
+    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.double)
+
+    version = property(__version.value, __version.set, None, None)
+
+
+    _ElementMap = {
+        __body.name() : __body,
+        __product_id.name() : __product_id,
+        __categories.name() : __categories,
+        __inline_attachment.name() : __inline_attachment,
+        __link_attachment.name() : __link_attachment,
+        __creation_date.name() : __creation_date,
+        __sensitivity.name() : __sensitivity,
+        __last_modification_date.name() : __last_modification_date,
+        __uid.name() : __uid
+    }
+    _AttributeMap = {
+        __version.name() : __version
+    }
+Namespace.addCategoryObject('typeBinding', u'XMLBase', XMLBase)
+
+
+# Complex type Note with content type ELEMENT_ONLY
+class Note (XMLBase):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Note')
+    # Base type is XMLBase
+
+    # Element {http://kolab.org}background-color uses Python identifier background_color
+    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False)
+
+
+    background_color = property(__background_color.value, __background_color.set, None, None)
+
+
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
+    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False)
+
+
+    foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
+
+
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
+
+
+    summary = property(__summary.value, __summary.set, None, None)
+
+
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __background_color.name() : __background_color,
+        __foreground_color.name() : __foreground_color,
+        __summary.name() : __summary
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+
+    })
+Namespace.addCategoryObject('typeBinding', u'Note', Note)
+
+
+# Complex type PhoneNumber with content type ELEMENT_ONLY
+class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Element {http://kolab.org}number uses Python identifier number
+    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
+
+
+    number = property(__number.value, __number.set, None, None)
+
+
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
+
+
+    type = property(__type.value, __type.set, None, None)
+
+
+    _ElementMap = {
+        __number.name() : __number,
+        __type.name() : __type
+    }
+    _AttributeMap = {
+
+    }
+Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
+
+
+# Complex type CTD_ANON_ with content type EMPTY
+class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
+    _Abstract = False
+    _ExpandedName = None
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_CTD_ANON__type', pyxb.binding.datatypes.string)
+
+    type = property(__type.value, __type.set, None, None)
+
+
+    _ElementMap = {
+
+    }
+    _AttributeMap = {
+        __type.name() : __type
+    }
+
+
+
+# Complex type Address with content type ELEMENT_ONLY
+class Address (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Element {http://kolab.org}postal-code uses Python identifier postal_code
+    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
+
+
+    postal_code = property(__postal_code.value, __postal_code.set, None, None)
+
+
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False)
+
+
+    type = property(__type.value, __type.set, None, None)
+
+
+    # Element {http://kolab.org}country uses Python identifier country
+    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
+
+
+    country = property(__country.value, __country.set, None, None)
+
+
+    # Element {http://kolab.org}locality uses Python identifier locality
+    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
+
+
+    locality = property(__locality.value, __locality.set, None, None)
+
+
+    # Element {http://kolab.org}street uses Python identifier street
+    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
+
+
+    street = property(__street.value, __street.set, None, None)
+
+
+    # Element {http://kolab.org}region uses Python identifier region
+    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
+
+
+    region = property(__region.value, __region.set, None, None)
+
+
+    _ElementMap = {
+        __postal_code.name() : __postal_code,
+        __type.name() : __type,
+        __country.name() : __country,
+        __locality.name() : __locality,
+        __street.name() : __street,
+        __region.name() : __region
+    }
+    _AttributeMap = {
+
+    }
+Namespace.addCategoryObject('typeBinding', u'Address', Address)
+
+
+# Complex type Recurrence with content type ELEMENT_ONLY
+class Recurrence (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Element {http://kolab.org}exclusion uses Python identifier exclusion
+    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
+
+
+    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+
+
+    # Element {http://kolab.org}interval uses Python identifier interval
+    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
+
+
+    interval = property(__interval.value, __interval.set, None, None)
+
+
+    # Element {http://kolab.org}rangetype uses Python identifier rangetype
+    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
+
+
+    rangetype = property(__rangetype.value, __rangetype.set, None, None)
+
+
+    _ElementMap = {
+        __exclusion.name() : __exclusion,
+        __interval.name() : __interval,
+        __rangetype.name() : __rangetype
+    }
+    _AttributeMap = {
+
+    }
+Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+
+
+# Complex type DailyRecurrence with content type ELEMENT_ONLY
+class DailyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    # Base type is Recurrence
+
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
+
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
+
+
+# Complex type MonthlyRecurrence with content type ELEMENT_ONLY
+class MonthlyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
+    # Base type is Recurrence
+
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgday', False)
+
+
+    day = property(__day.value, __day.set, None, None)
+
+
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
+
+
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+
+
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
+
+    type = property(__type.value, __type.set, None, None)
+
+
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_MonthlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'monthly', required=True)
+
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        __day.name() : __day,
+        __daynumber.name() : __daynumber
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __type.name() : __type,
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'MonthlyRecurrence', MonthlyRecurrence)
+
+
+# Complex type Name with content type ELEMENT_ONLY
+class Name (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
+    # Base type is pyxb.binding.datatypes.anyType
+
+    # Element {http://kolab.org}last-name uses Python identifier last_name
+    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
+
+
+    last_name = property(__last_name.value, __last_name.set, None, None)
+
+
+    # Element {http://kolab.org}middle-names uses Python identifier middle_names
+    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
+
+
+    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+
+
+    # Element {http://kolab.org}suffix uses Python identifier suffix
+    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
+
+
+    suffix = property(__suffix.value, __suffix.set, None, None)
+
+
+    # Element {http://kolab.org}initials uses Python identifier initials
+    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
+
+
+    initials = property(__initials.value, __initials.set, None, None)
+
+
+    # Element {http://kolab.org}full-name uses Python identifier full_name
+    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
+
+
+    full_name = property(__full_name.value, __full_name.set, None, None)
+
+
+    # Element {http://kolab.org}given-name uses Python identifier given_name
+    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
+
+
+    given_name = property(__given_name.value, __given_name.set, None, None)
+
+
+    # Element {http://kolab.org}prefix uses Python identifier prefix
+    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
+
+
+    prefix = property(__prefix.value, __prefix.set, None, None)
+
+
+    _ElementMap = {
+        __last_name.name() : __last_name,
+        __middle_names.name() : __middle_names,
+        __suffix.name() : __suffix,
+        __initials.name() : __initials,
+        __full_name.name() : __full_name,
+        __given_name.name() : __given_name,
+        __prefix.name() : __prefix
+    }
+    _AttributeMap = {
+
+    }
+Namespace.addCategoryObject('typeBinding', u'Name', Name)
+
+
+# Complex type Contact with content type ELEMENT_ONLY
+class Contact (XMLBase):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    # Base type is XMLBase
+
+    # Element {http://kolab.org}phone uses Python identifier phone
+    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
+
+
+    phone = property(__phone.value, __phone.set, None, None)
+
+
+    # Element {http://kolab.org}im-address uses Python identifier im_address
+    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
+
+
+    im_address = property(__im_address.value, __im_address.set, None, None)
+
+
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}address uses Python identifier address
+    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
+
+
+    address = property(__address.value, __address.set, None, None)
+
+
+    # Element {http://kolab.org}office-location uses Python identifier office_location
+    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
+
+
+    office_location = property(__office_location.value, __office_location.set, None, None)
+
+
+    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
+    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
+
+
+    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
+
+
+    # Element {http://kolab.org}latitude uses Python identifier latitude
+    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
+
+
+    latitude = property(__latitude.value, __latitude.set, None, None)
+
+
+    # Element {http://kolab.org}job-title uses Python identifier job_title
+    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
+
+
+    job_title = property(__job_title.value, __job_title.set, None, None)
+
+
+    # Element {http://kolab.org}manager-name uses Python identifier manager_name
+    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
+
+
+    manager_name = property(__manager_name.value, __manager_name.set, None, None)
+
+
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}email uses Python identifier email
+    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
+
+
+    email = property(__email.value, __email.set, None, None)
+
+
+    # Element {http://kolab.org}assistant uses Python identifier assistant
+    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
+
+
+    assistant = property(__assistant.value, __assistant.set, None, None)
+
+
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}nick-name uses Python identifier nick_name
+    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
+
+
+    nick_name = property(__nick_name.value, __nick_name.set, None, None)
+
+
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}profession uses Python identifier profession
+    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
+
+
+    profession = property(__profession.value, __profession.set, None, None)
+
+
+    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
+    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
+
+
+    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
+
+
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}birthday uses Python identifier birthday
+    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
+
+
+    birthday = property(__birthday.value, __birthday.set, None, None)
+
+
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}anniversary uses Python identifier anniversary
+    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
+
+
+    anniversary = property(__anniversary.value, __anniversary.set, None, None)
+
+
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}picture uses Python identifier picture
+    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
+
+
+    picture = property(__picture.value, __picture.set, None, None)
+
+
+    # Element {http://kolab.org}name uses Python identifier name
+    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
+
+
+    name = property(__name.value, __name.set, None, None)
+
+
+    # Element {http://kolab.org}department uses Python identifier department
+    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
+
+
+    department = property(__department.value, __department.set, None, None)
+
+
+    # Element {http://kolab.org}children uses Python identifier children
+    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
+
+
+    children = property(__children.value, __children.set, None, None)
+
+
+    # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
+    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
+
+
+    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
+
+
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}gender uses Python identifier gender
+    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
+
+
+    gender = property(__gender.value, __gender.set, None, None)
+
+
+    # Element {http://kolab.org}organization uses Python identifier organization
+    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
+
+
+    organization = property(__organization.value, __organization.set, None, None)
+
+
+    # Element {http://kolab.org}longitude uses Python identifier longitude
+    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
+
+
+    longitude = property(__longitude.value, __longitude.set, None, None)
+
+
+    # Element {http://kolab.org}language uses Python identifier language
+    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
+
+
+    language = property(__language.value, __language.set, None, None)
+
+
+    # Element {http://kolab.org}web-page uses Python identifier web_page
+    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
+
+
+    web_page = property(__web_page.value, __web_page.set, None, None)
+
+
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __phone.name() : __phone,
+        __im_address.name() : __im_address,
+        __address.name() : __address,
+        __office_location.name() : __office_location,
+        __preferred_address.name() : __preferred_address,
+        __latitude.name() : __latitude,
+        __job_title.name() : __job_title,
+        __manager_name.name() : __manager_name,
+        __email.name() : __email,
+        __assistant.name() : __assistant,
+        __nick_name.name() : __nick_name,
+        __profession.name() : __profession,
+        __spouse_name.name() : __spouse_name,
+        __birthday.name() : __birthday,
+        __anniversary.name() : __anniversary,
+        __picture.name() : __picture,
+        __name.name() : __name,
+        __department.name() : __department,
+        __children.name() : __children,
+        __free_busy_url.name() : __free_busy_url,
+        __gender.name() : __gender,
+        __organization.name() : __organization,
+        __longitude.name() : __longitude,
+        __language.name() : __language,
+        __web_page.name() : __web_page
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+
+    })
+Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
+
+
+# Complex type CTD_ANON_2 with content type ELEMENT_ONLY
+class CTD_ANON_2 (SMTPContact):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = None
+    # Base type is SMTPContact
+
+    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+
+    # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
+
+    # Element {http://kolab.org}role uses Python identifier role
+    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_CTD_ANON_2_httpkolab_orgrole', False)
+
+
+    role = property(__role.value, __role.set, None, None)
+
+
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_CTD_ANON_2_httpkolab_orgstatus', False)
+
+
+    status = property(__status.value, __status.set, None, None)
+
+
+    # Element {http://kolab.org}request-response uses Python identifier request_response
+    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_CTD_ANON_2_httpkolab_orgrequest_response', False)
+
+
+    request_response = property(__request_response.value, __request_response.set, None, None)
+
+
+    _ElementMap = SMTPContact._ElementMap.copy()
+    _ElementMap.update({
+        __role.name() : __role,
+        __status.name() : __status,
+        __request_response.name() : __request_response
+    })
+    _AttributeMap = SMTPContact._AttributeMap.copy()
+    _AttributeMap.update({
+
+    })
+
+
+
+# Complex type YearlyRecurrence with content type ELEMENT_ONLY
+class YearlyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
+    # Base type is Recurrence
+
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
+
+
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+
+
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+
+    # Element {http://kolab.org}month uses Python identifier month
+    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
+
+
+    month = property(__month.value, __month.set, None, None)
+
+
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
+
+
+    day = property(__day.value, __day.set, None, None)
+
+
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', STD_ANON, required=True)
+
+    type = property(__type.value, __type.set, None, None)
+
+
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
+
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        __daynumber.name() : __daynumber,
+        __month.name() : __month,
+        __day.name() : __day
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __type.name() : __type,
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
+
+
+# Complex type Incidence with content type ELEMENT_ONLY
+class Incidence (XMLBase):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
+    # Base type is XMLBase
+
+    # Element {http://kolab.org}organizer uses Python identifier organizer
+    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
+
+
+    organizer = property(__organizer.value, __organizer.set, None, None)
+
+
+    # Element {http://kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Incidence_httpkolab_orgsummary', False)
+
+
+    summary = property(__summary.value, __summary.set, None, None)
+
+
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}alarm uses Python identifier alarm
+    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
+
+
+    alarm = property(__alarm.value, __alarm.set, None, None)
+
+
+    # Element {http://kolab.org}location uses Python identifier location
+    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
+
+
+    location = property(__location.value, __location.set, None, None)
+
+
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}creator uses Python identifier creator
+    __creator = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creator'), 'creator', '__httpkolab_org_Incidence_httpkolab_orgcreator', False)
+
+
+    creator = property(__creator.value, __creator.set, None, None)
+
+
+    # Element {http://kolab.org}attendee uses Python identifier attendee
+    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
+
+
+    attendee = property(__attendee.value, __attendee.set, None, None)
+
+
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}recurrence uses Python identifier recurrence
+    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
+
+
+    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+
+
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __organizer.name() : __organizer,
+        __summary.name() : __summary,
+        __alarm.name() : __alarm,
+        __location.name() : __location,
+        __creator.name() : __creator,
+        __attendee.name() : __attendee,
+        __recurrence.name() : __recurrence
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+
+    })
+Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
+
+
+# Complex type Event with content type ELEMENT_ONLY
+class Event (Incidence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
+    # Base type is Incidence
+
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
+
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+
+    # Element {http://kolab.org}end-date uses Python identifier end_date
+    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
+
+
+    end_date = property(__end_date.value, __end_date.set, None, None)
+
+
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
+    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
+
+
+    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
+
+
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
+
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
+
+
+    start_date = property(__start_date.value, __start_date.set, None, None)
+
+
+    # Element {http://kolab.org}color-label uses Python identifier color_label
+    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
+
+
+    color_label = property(__color_label.value, __color_label.set, None, None)
+
+
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = Incidence._ElementMap.copy()
+    _ElementMap.update({
+        __end_date.name() : __end_date,
+        __show_time_as.name() : __show_time_as,
+        __start_date.name() : __start_date,
+        __color_label.name() : __color_label
+    })
+    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap.update({
+
+    })
+Namespace.addCategoryObject('typeBinding', u'Event', Event)
+
+
+# Complex type WeeklyRecurrence with content type ELEMENT_ONLY
+class WeeklyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
+    # Base type is Recurrence
+
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
+
+    cycle = property(__cycle.value, __cycle.set, None, None)
+
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'WeeklyRecurrence', WeeklyRecurrence)
+
+
+# Complex type Task with content type ELEMENT_ONLY
+class Task (Incidence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
+    # Base type is Incidence
+
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+
+    # Element {http://kolab.org}due-date uses Python identifier due_date
+    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
+
+
+    due_date = property(__due_date.value, __due_date.set, None, None)
+
+
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}priority uses Python identifier priority
+    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
+
+
+    priority = property(__priority.value, __priority.set, None, None)
+
+
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}parent uses Python identifier parent
+    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
+
+
+    parent = property(__parent.value, __parent.set, None, None)
+
+
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
+
+
+    start_date = property(__start_date.value, __start_date.set, None, None)
+
+
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
+
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
+
+
+    status = property(__status.value, __status.set, None, None)
+
+
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+
+    # Element {http://kolab.org}completed uses Python identifier completed
+    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
+
+
+    completed = property(__completed.value, __completed.set, None, None)
+
+
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
+
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = Incidence._ElementMap.copy()
+    _ElementMap.update({
+        __due_date.name() : __due_date,
+        __priority.name() : __priority,
+        __parent.name() : __parent,
+        __start_date.name() : __start_date,
+        __status.name() : __status,
+        __completed.name() : __completed
+    })
+    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap.update({
+
+    })
+Namespace.addCategoryObject('typeBinding', u'Task', Task)
+
+
+note = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'note'), Note)
+Namespace.addCategoryObject('elementBinding', note.name().localName(), note)
+
+contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
+Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
+
+event = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'event'), Event)
+Namespace.addCategoryObject('elementBinding', event.name().localName(), event)
+
+task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
+Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
+
+
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
+SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+    )
+SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+
+
+CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
+    )
+CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
+XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
+Note._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Note._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'background-color')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'foreground-color')), min_occurs=1, max_occurs=1)
+    )
+Note._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Note._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Note._ContentModel = pyxb.binding.content.ParticleModel(Note._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
+    )
+PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
+Address._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
+    )
+Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_, scope=Recurrence))
+Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+MonthlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+MonthlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1)
+    )
+MonthlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+MonthlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
+Name._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
+    )
+Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'office-location'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'preferred-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'latitude')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'longitude')), min_occurs=1, max_occurs=1)
+    )
+Contact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+CTD_ANON_2._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON_2))
+
+CTD_ANON_2._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON_2))
+
+CTD_ANON_2._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON_2))
+CTD_ANON_2._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON_2._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_2._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON_2._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+CTD_ANON_2._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+YearlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'month')), min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON_2, scope=Incidence))
+
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON, scope=Incidence))
+Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
+Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_3 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._GroupModel_2, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._GroupModel_3, min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel_4 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'show-time-as')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'color-label')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'end-date')), min_occurs=1, max_occurs=1)
+    )
+Event._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Event._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._GroupModel_4, min_occurs=1, max_occurs=1)
+    )
+Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_occurs=1, max_occurs=1)
+
+
+WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_2, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_3, min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_4 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'priority')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'completed')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'due-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'parent')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_4, min_occurs=1, max_occurs=1)
+    )
+Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_occurs=1, max_occurs=1)


commit c64fe2abde698303641a43392fb1514b71ff002a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 21 14:26:34 2011 +0100

    Add files required by autofoo(TM)

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..7d1c323
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,365 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29


commit 4ce6ede280ae78d18680cf9b9d818b9d6c664946
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 21 14:05:02 2011 +0100

    Exclude changes to the schema from accidently being committed as well

diff --git a/.gitignore b/.gitignore
index 4a48f95..dd965cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ CMakeCache.txt
 moc_*
 *.moc
 *.cmake
+# We MUST not modify the schemas
+schemas/*.xsd
 Makefile
 Makefile.in
 *.log


commit 1c2b5318a9917b72449463dfe4a0b28fb3588503
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 21 14:04:23 2011 +0100

    Add .gitignore file for Python bindings side of the repository

diff --git a/.gitignore b/.gitignore
index a9d2afd..4a48f95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,19 @@ CMakeCache.txt
 moc_*
 *.moc
 *.cmake
+Makefile
+Makefile.in
+*.log
+*.pyc
+*.pyo
+*.spec
+*.tar.gz
+aclocal.m4
+autom4te.cache/
+bin/test*
+config.log
+config.status
+configure
+po/*.gmo
+po/POTFILES
+pykolab-[0-9]*.*/


commit 55d7e026f139626ba1fe69e3d22cc10e57eb2aa8
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Nov 14 20:25:23 2011 +0100

    Added gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a9d2afd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*~
+CMakeFiles
+CMakeCache.txt
+moc_*
+*.moc
+*.cmake


commit 59b83ad700ff516ecd38e2c30d9e86c00325b8f4
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Oct 31 00:07:08 2011 +0100

    make optional

diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 988b7bb..1db62a5 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -85,8 +85,8 @@
             <xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
             <xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
             <xs:element name="occurence" type="xs:int" maxOccurs="unbounded" minOccurs="0" />
-            <xs:element name="weekstart" type="xs:int" />
-            <xs:choice>
+            <xs:element name="weekstart" type="xs:int" maxOccurs="1" minOccurs="0" />
+            <xs:choice maxOccurs="1" minOccurs="0">
                 <xs:element name="count" type="xs:int" />
                 <xs:element name="enddate" type="xs:dateTime" />
             </xs:choice>


commit 6216173988b8156b8b5fa98f3510f98256f22680
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Sun Oct 30 23:55:35 2011 +0100

    updated recurrences

diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 9eb24d1..988b7bb 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -53,43 +53,43 @@
 
 
     <xs:complexType name="Recurrence">
-    	<xs:sequence>
-    		<xs:element name="cycle" type="Cycle" maxOccurs="unbounded"
-    			minOccurs="1">
-    		</xs:element>
-    		<xs:choice>
-    			<xs:element name="count" type="xs:int"></xs:element>
-    			<xs:element name="enddate" type="xs:dateTime"></xs:element>
-    		</xs:choice>
-    		<xs:element name="exception" type="Exception"
-    			maxOccurs="unbounded" minOccurs="0">
-    		</xs:element>
-    	</xs:sequence>
+        <xs:sequence>
+            <xs:element name="rule" type="Rule" maxOccurs="unbounded" minOccurs="0" />
+            <xs:element name="date" type="xs:dateTime" maxOccurs="unbounded" minOccurs="0" />
+            <xs:element name="exception" type="Exception" maxOccurs="unbounded" minOccurs="0" />
+        </xs:sequence>
     </xs:complexType>
     
     <xs:complexType name="Interval">
-   		<xs:choice>
-   			<xs:element name="interval" type="xs:int"></xs:element>
-   			<xs:element name="list" type="xs:int" maxOccurs="unbounded" minOccurs="1"></xs:element>
-   		</xs:choice>
+        <xs:choice>
+            <xs:element name="interval" type="xs:int"/>
+            <xs:element name="list" type="xs:int" maxOccurs="unbounded" minOccurs="1" />
+        </xs:choice>
     </xs:complexType>
 
     <xs:complexType name="Exception">
-    	<xs:sequence>
-    		<xs:element name="date" type="xs:dateTime"></xs:element>
-    		<xs:element name="subevent" type="xs:string"></xs:element>
-    	</xs:sequence>
+        <xs:sequence>
+            <xs:element name="rule" type="Rule" />
+            <xs:element name="date" type="xs:dateTime" />
+            <xs:element name="subevent" type="xs:string" />
+        </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="Cycle">
-    	<xs:sequence>
-    	   <xs:element name="yearly" type="Interval" maxOccurs="1" minOccurs="0" />
-    	   <xs:element name="monthly" type="Interval" maxOccurs="1" minOccurs="0" />
-    	   <xs:element name="weekly" type="Interval" maxOccurs="1" minOccurs="0" />
-    	   <xs:element name="daily" type="Interval" maxOccurs="1" minOccurs="0" />
-    	   <xs:element name="hourly" type="Interval" maxOccurs="1" minOccurs="0" />
-    	   <xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
-    	   <xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
-    	</xs:sequence>
+    <xs:complexType name="Rule">
+        <xs:sequence>
+            <xs:element name="yearly" type="Interval" maxOccurs="1" minOccurs="0" />
+            <xs:element name="monthly" type="Interval" maxOccurs="1" minOccurs="0" />
+            <xs:element name="weekly" type="Interval" maxOccurs="1" minOccurs="0" />
+            <xs:element name="daily" type="Interval" maxOccurs="1" minOccurs="0" />
+            <xs:element name="hourly" type="Interval" maxOccurs="1" minOccurs="0" />
+            <xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
+            <xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
+            <xs:element name="occurence" type="xs:int" maxOccurs="unbounded" minOccurs="0" />
+            <xs:element name="weekstart" type="xs:int" />
+            <xs:choice>
+                <xs:element name="count" type="xs:int" />
+                <xs:element name="enddate" type="xs:dateTime" />
+            </xs:choice>
+        </xs:sequence>
     </xs:complexType>
 </xs:schema>
\ No newline at end of file


commit a73c4d24e5cb0137425e4bb7ea763446203d003f
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Oct 28 21:01:31 2011 +0200

    use multiple cycles instead of repeating the whole recurrence

diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index bad72bf..9eb24d1 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -15,7 +15,7 @@
                     <xs:element name="creator" type="SMTPContact" />
                     <xs:element name="organizer" type="SMTPContact" />
                     <xs:element name="alarm" type="xs:string" />
-                    <xs:element name="recurrence" type="Recurrence" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:element name="recurrence" type="Recurrence" minOccurs="0" maxOccurs="1"/>
                     <xs:element name="attendee" type="Attendee" />
                 </xs:sequence>
             </xs:extension>
@@ -54,13 +54,9 @@
 
     <xs:complexType name="Recurrence">
     	<xs:sequence>
-    		<xs:element name="yearly" type="Interval" maxOccurs="1" minOccurs="0" />
-    		<xs:element name="monthly" type="Interval" maxOccurs="1" minOccurs="0" />
-    		<xs:element name="weekly" type="Interval" maxOccurs="1" minOccurs="0" />
-    		<xs:element name="daily" type="Interval" maxOccurs="1" minOccurs="0" />
-    		<xs:element name="hourly" type="Interval" maxOccurs="1" minOccurs="0" />
-    		<xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
-    		<xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:element name="cycle" type="Cycle" maxOccurs="unbounded"
+    			minOccurs="1">
+    		</xs:element>
     		<xs:choice>
     			<xs:element name="count" type="xs:int"></xs:element>
     			<xs:element name="enddate" type="xs:dateTime"></xs:element>
@@ -84,4 +80,16 @@
     		<xs:element name="subevent" type="xs:string"></xs:element>
     	</xs:sequence>
     </xs:complexType>
+
+    <xs:complexType name="Cycle">
+    	<xs:sequence>
+    	   <xs:element name="yearly" type="Interval" maxOccurs="1" minOccurs="0" />
+    	   <xs:element name="monthly" type="Interval" maxOccurs="1" minOccurs="0" />
+    	   <xs:element name="weekly" type="Interval" maxOccurs="1" minOccurs="0" />
+    	   <xs:element name="daily" type="Interval" maxOccurs="1" minOccurs="0" />
+    	   <xs:element name="hourly" type="Interval" maxOccurs="1" minOccurs="0" />
+    	   <xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
+    	   <xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
+    	</xs:sequence>
+    </xs:complexType>
 </xs:schema>
\ No newline at end of file


commit fe24da9e687415550bab73e0873cc752c4d2ac7e
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Oct 28 20:42:30 2011 +0200

    recurrence v1

diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 3aa082f..bad72bf 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -15,7 +15,7 @@
                     <xs:element name="creator" type="SMTPContact" />
                     <xs:element name="organizer" type="SMTPContact" />
                     <xs:element name="alarm" type="xs:string" />
-                    <xs:element name="recurrence" type="Recurrence" />
+                    <xs:element name="recurrence" type="Recurrence" minOccurs="0" maxOccurs="unbounded"/>
                     <xs:element name="attendee" type="Attendee" />
                 </xs:sequence>
             </xs:extension>
@@ -51,79 +51,37 @@
         </xs:restriction>
     </xs:simpleType>
 
-    <xs:simpleType name="Cycle">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="daily" />
-            <xs:enumeration value="weekly" />
-            <xs:enumeration value="monthly" />
-            <xs:enumeration value="yearly" />
-        </xs:restriction>
-    </xs:simpleType>
 
-    <xs:complexType name="Recurrence" abstract="true">
-        <xs:sequence>
-            <xs:element name="interval" type="xs:string" />
-            <xs:element name="exclusion" type="xs:string" maxOccurs="unbounded" minOccurs="0" />
-            <xs:element name="rangetype" type="RecurrenceType" />
-        </xs:sequence>
+    <xs:complexType name="Recurrence">
+    	<xs:sequence>
+    		<xs:element name="yearly" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:element name="monthly" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:element name="weekly" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:element name="daily" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:element name="hourly" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:element name="minutely" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:element name="secondly" type="Interval" maxOccurs="1" minOccurs="0" />
+    		<xs:choice>
+    			<xs:element name="count" type="xs:int"></xs:element>
+    			<xs:element name="enddate" type="xs:dateTime"></xs:element>
+    		</xs:choice>
+    		<xs:element name="exception" type="Exception"
+    			maxOccurs="unbounded" minOccurs="0">
+    		</xs:element>
+    	</xs:sequence>
     </xs:complexType>
-
-    <xs:complexType name="RecurrenceType" abstract="true">
-        <xs:attribute name="type" type="xs:string" />
-    </xs:complexType>
-
-    <xs:complexType name="DailyRecurrence">
-        <xs:complexContent>
-            <xs:extension base="Recurrence">
-                <xs:attribute name="cycle" type="xs:string" fixed="daily" use="required" />
-            </xs:extension>
-        </xs:complexContent>
+    
+    <xs:complexType name="Interval">
+   		<xs:choice>
+   			<xs:element name="interval" type="xs:int"></xs:element>
+   			<xs:element name="list" type="xs:int" maxOccurs="unbounded" minOccurs="1"></xs:element>
+   		</xs:choice>
     </xs:complexType>
 
-    <xs:complexType name="WeeklyRecurrence">
-        <xs:complexContent>
-            <xs:extension base="Recurrence">
-                <xs:attribute name="cycle" type="xs:string" fixed="weekly" use="required" />
-            </xs:extension>
-        </xs:complexContent>
+    <xs:complexType name="Exception">
+    	<xs:sequence>
+    		<xs:element name="date" type="xs:dateTime"></xs:element>
+    		<xs:element name="subevent" type="xs:string"></xs:element>
+    	</xs:sequence>
     </xs:complexType>
-
-    <xs:complexType name="MonthlyRecurrence">
-        <xs:complexContent>
-            <xs:extension base="Recurrence">
-                <xs:sequence>
-                    <xs:element name="interval" type="xs:string">
-                    </xs:element>
-                    <xs:element name="day" type="xs:string">
-                    </xs:element>
-                    <xs:element name="daynumber" type="xs:string">
-                    </xs:element>
-                </xs:sequence>
-                <xs:attribute name="cycle" type="xs:string" fixed="monthly" use="required" />
-                <xs:attribute name="type" type="xs:string" use="required" />
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:complexType name="YearlyRecurrence">
-        <xs:complexContent>
-            <xs:extension base="Recurrence">
-                <xs:sequence>
-                    <xs:element name="interval" type="xs:string" />
-                    <xs:element name="day" type="xs:string" />
-                    <xs:element name="daynumber" type="xs:string" />
-                    <xs:element name="month" type="xs:string" />
-                </xs:sequence>
-                <xs:attribute name="cycle" type="xs:string" fixed="yearly" use="required" />
-                <xs:attribute name="type" type="xs:string" use="required">
-                    <xs:restriction base="xs:string">
-                        <xs:enumeration value="monthday" />
-                        <xs:enumeration value="yearday" />
-                        <xs:enumeration value="weekday" />
-                    </xs:restriction>
-                </xs:attribute>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
 </xs:schema>
\ No newline at end of file


commit 5198b32d4e57b684725228319b24322c47eec65d
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Oct 27 11:33:58 2011 +0200

    updated testfiles

diff --git a/testfiles/testcontact.xml b/testfiles/testcontact.xml
index 0869190..1db956b 100644
--- a/testfiles/testcontact.xml
+++ b/testfiles/testcontact.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<contact version="1.0" xmlns="kolab.org">
+<contact version="3.0dev1" xmlns="http://kolab.org">
   <!-- Common fields -->
   <uid>uid</uid>
   <body></body>
diff --git a/testfiles/testevent.xml b/testfiles/testevent.xml
index e72559d..57aff69 100644
--- a/testfiles/testevent.xml
+++ b/testfiles/testevent.xml
@@ -34,41 +34,41 @@
   <start-date>2001-12-31T12:00:00</start-date>
   <end-date>2001-12-31T12:00:00</end-date>
 </event-->
-<event version="1.0" xmlns="kolab.org">
+<event version="3.0dev1" xmlns="http://kolab.org">
   <!-- Common fields -->
   <uid>uid</uid>
-  <body></body>
-  <categories></categories>
+  <product-id></product-id>
   <creation-date>2004-05-04T15:00:00Z</creation-date>
   <last-modification-date>2004-05-04T15:00:00Z</last-modification-date>
   <sensitivity>public</sensitivity>
+  <body></body>
+  <categories></categories>
   <inline-attachment></inline-attachment>
   <link-attachment></link-attachment>
-  <product-id></product-id>
   <!-- Incidence fields -->
   <summary>(string, default empty)</summary>
   <location>(string, default empty)</location>
   <creator>
-    <display-name>(string, default empty)</display-name>
     <smtp-address>(string, default empty)</smtp-address>
+    <display-name>(string, default empty)</display-name>
   </creator>
   <organizer>
-    <display-name>(string, default empty)</display-name>
     <smtp-address>(string, default empty)</smtp-address>
+    <display-name>(string, default empty)</display-name>
   </organizer>
   <alarm>(number, no default)</alarm>
-  <recurrence cycle="cycletype">
+  <dailyrecurrence cycle="daily">
     <interval>1</interval>
     <day>(string, no default)</day>
     <daynumber>0</daynumber>
     <date>2</date>
     <month>(string, no default></month>
-    <range type="rangetype"></range>
+    <range type="daily"></range>
     <exclusion>(date, no default)</exclusion>
-  </recurrence>
+  </dailyrecurrence>
   <attendee>
-    <display-name>(string, default empty)</display-name>
     <smtp-address>(string, default empty)</smtp-address>
+    <display-name>(string, default empty)</display-name>
     <status>(string, default none)</status>
     <request-response>(bool, default true)</request-response>
     <role>(string, default required)</role>
diff --git a/testfiles/testnote.xml b/testfiles/testnote.xml
index 8c211dd..f7ad5b0 100644
--- a/testfiles/testnote.xml
+++ b/testfiles/testnote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<note version="1.0" xmlns="kolab.org">
+<note version="3.0dev1" xmlns="http://kolab.org">
   <!-- Common fields -->
   <uid>uid</uid>
   <body></body>


commit d901101112a58fb88050cf70fd0387b892853a56
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Oct 27 11:31:53 2011 +0200

    attendee is not abstract

diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index dfbc62d..3aa082f 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -22,7 +22,7 @@
         </xs:complexContent>
     </xs:complexType>
 
-    <xs:complexType name="Attendee" abstract="true">
+    <xs:complexType name="Attendee">
         <xs:complexContent>
             <xs:extension base="SMTPContact">
                 <xs:sequence>


commit 03c0c74a176b1c43ba13b32545e8582f673dd5bd
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Oct 27 11:31:28 2011 +0200

    specify role/status

diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 86436af..dfbc62d 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -26,14 +26,31 @@
         <xs:complexContent>
             <xs:extension base="SMTPContact">
                 <xs:sequence>
-                    <xs:element name="status" type="xs:string" />
+                    <xs:element name="status" type="Status" />
                     <xs:element name="request-response" type="xs:string" />
-                    <xs:element name="role" type="xs:string" />
+                    <xs:element name="role" type="Role" />
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
 
+    <xs:simpleType name="Status">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="none" />
+            <xs:enumeration value="tentative" />
+            <xs:enumeration value="accepted" />
+            <xs:enumeration value="declined" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="Role">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="required" />
+            <xs:enumeration value="optional" />
+            <xs:enumeration value="resource" />
+        </xs:restriction>
+    </xs:simpleType>
+
     <xs:simpleType name="Cycle">
         <xs:restriction base="xs:string">
             <xs:enumeration value="daily" />





More information about the commits mailing list