Move mapper to its own method in core :)