Feature / Consolidate DrawModel