Added CGenericWindow etc