Mapper additions for awesome.
Fixed a merge conflict.