Added Window Class