Close #1. Implement component tracking