Add tracking of some components.