Add support for witnesses via a manual mapping