Added --options switch.