Added a couple of options that can be specified at runtime