Merged some logging stuff with entity resolution