Added 'language' option support