Mock response changed to use the Intra.
Added more flexibility to the simulator