added additional comments to mapping