Fixes T134 and added more mapper options