Changes to mapper