#12 : Added add answer handler