Add better mapping example