Re-adding get_mapper. It will take some effort to remove it correctly.