Enhanced the instance creation and the svg creation