Added component mapping