Improved ComponentLoop