Changes to use corpus evaluation