Improved detection of attributes to load lazily.