Modify WindowSupport