Made changes to support latest version of the framework