metadata sotre refactoring
metadata sotre refactoring