Add preview support
1.8.0