Add logging
Add logging