WIP: Matcher Diversity is now stored in DB.