Entity loader enhancements.