Add ability to pass through -s option