Add support for SRSS window