Fixed rotations in DDR
Added shapeBegin/End groupings in DDR