Updated the verbose keyword handling