Added back some logging during entity processing