added response model
resolved merge conflicts