Added support for window