SGraphic refactoring 80%