Move questions to a dedicated file
Modify child add capture