Getting the framework compliant with what's hapenning in ntentan