Fixed parent class and removed Window/*