Added support for custom key/value seperators