Improved Mapping, updated reference list