Updated Quad class