Updates to design doc