Updated some structure