More generation support -- missing class & class types (on going)