Some work on ComponentContainer.java: 1. Improved thread safety 2. Optimization 3. Code cleanup 4. Use String constant instead of hard-coded value