Update eager loading method, #1791