Added compatibility for different file separators