added custom mapper