Added more %dir