Updated for latest dired+