New version with Testingbot support