Fixed and consolidated class introspection calls