Added support for custom time sperator