Update to a more portable escapeField() and Hash class