Added logging and Quoting