Added the Window class