Added auto detection object classes with circular reference fields