Even better dir handling