:candy: Better mapping suggestion