Adding switch to help support Jenkins