Added auto mocking