Ensuring all components are included