Reorganized the class hierarchy a bit and moved some query parameter properties around, to hopefully make more sense.