Added window factory