Added support for sliding window