Add question support