Add components
Cleanup