Adding command line overrides