Add more language values related to #7