Switched app to used corpus manager