Integrating vObject 2.1 into 1.7