Fix DEVKIT-994. Extending framework recommended class