Components: Expand comments