Add support for different field separators