DiWrapper simplification