Additions to design doc