Added mapper skeleton