Add support for -W, -Q options