Better current directory management