Little refactoring for #5
Increase old metadata gc engine for #5