Use new moduler diddleman