DataMock improvement