Challenges api improvement