Update to use NULL preview component