Improve mapper interface.