Add better language support