Work on CDI 2.0 Book