Add lazyLoadOnLoad hook, expand enhancements