Modified some structure