Add logging infrastructure