mapper changes to operate on sentences