Added more details about custom mapping