Added Query and Parameter objects