Added quoting functionality