Improved variant rendering with proper data.