Moved graphics object handling into GraphicManager