Updated graphics classes