Add structured logging in the places where it makes sense