Structural change, remove most of the di doc stuff to concentrate on constructor and setter