Improved EntryModelGenerator
Auto eager loading will redone or discarded