e1.31: add support for manual mapping