Allow custom properties to be added to payload
added special character handling.