Added challengeState support for challenge markers