Joined components
Removed .container dependency