[CDF-222] Allow empty path
[CDF-233] - Improvement