Changed some structure