added subschallenges and most current prod data model