Add hyphen trimmer and sample skip bigramn