Title: Redrawing the Class Map