Added configuration variable for r2q