Improvements for container component