Added subdir macro