exanding use of corpus mapper