For the new framework

I made the changes to get rid of the deprecated classes