Added logging infrastructure