Add ComponentId annotations and TODOs.