Integrating vObject 2.1 into SD 1.7