Tweaking mapping.