Added some form of language support among other things