Added first mapping component