<Directory> management added