Better handling of single/multiple file metadata operations