New method added
Exit command handling changed