Ensure we return all components