Design & Documentation updates