Tweak to use directory task