Major changes to mapper.