Fixes and add other language class