Added strucutre detector