including entity info in more logging statements