Adding Preview App support