Updated design doc