Added logic for Unigrams and Bigrams identification