Refactored metadata model