Add new logic for Questions