Added eager loading for non JSON users