Added query parameter support