Add logging to key classes