Feature/logging improvements