Group and track work with components