Added a couple of input flags