Add 4.x and 5.x questions