Added mising structures - compiles (yay)