Implemented component mapping