Changes to manage previews