refactored metadata