More logging and use of redirector