Updating the SDK to support the new framework