Optimize import and remove GraphicModel