Added support for more separators