add some more fields for target-dir and -name