Improved WIC functionality.