Fixed bugs and change of Structure Set spec.