mapper improved with coffee scenario examples