Adding -a and -s command processing