Renamed options to add short options