Improve mapping and config support.