Add multiwindow support