Added support for generated and inner classes