Update for language changes and go runtimeless!