refactoring metadata options