Added support for directory separator