ClearNLP changes: Required modifications for 2.0.x