More ComponentId annotations and generate TODO for message annotation.