Added mapping fgd