Update for language/library changes