added support for delimiter