Refactored ClassMetadata