Added Window class