added custom mapping
added custom mapping