rework mapping to include more info