Make changes in adaptor API for multiple windows.