Added windowId