Added short switches.