Enhance mapping of C-API.