Added single char switches