corpus directories management improved