Changes to demo component mapping