Added mocking capabilities