Add different seperator support