Added support for limited corpus