Adding some structure to the hacks