Updating some component mappings