NO longer generate the class dynamicly, just 2 different classes for 2 supported versions will be enough