added Navigator to mapper