Add answer checks