Added OfficialDrawing model and formatting update