Changed some structures.