Add dynamic question support