Simplified direcory handling in parallel case