Update to real options for language and type