Updated aggregate to use baseDir not crossTarget