Refactor SimpleMetadataModel