Update namo-integrated branch to use the new SDK