Adding support for setting trim_words