Added hacking of structures