Continued doc rework with Model