Added target directory support