Added support for different kinds of sentences