Updated defs and function list in design doc