Resolved logging TODO