Bug fix

To & From fields can be String or Array