Updated for language and dependency changes.