Refactoring metadata