Added window classes