metadata refactored