Improve mapping #156