Improve Preview Render support to get it working fully...