Update for language changes (Option API and visibility)