Removed IUnit abstraction