Works for the new changes to the framework