Added Disc and Peg structs