Done refactoring how to handle different delimiter