New features added to mapper