Update to new simplified diddleman structure