Compatibility update

Updated code to account for language and SDK changes