optimize for add and remove files
0.3.7