Make changes for supporting both versions

Tested on 2.062 and 1.076 including generated code