Modificate structure for shape shift plugin