Update Logging to use Id if id exists