Added window creation