Add -s and -f abreviations.