I don't feel that 2.0 needs a wrapper. Adding one would seem to make the code less maintainable IMO.