Adds support for a couple of more language