Updated graphic-class