Update for language changes

Closes #101