Not quite ready for 1.1, but use the 1.1 versions of collection and dataobject.