Added named urls and challenge grouping