More OO implementation of the transformation