Added support for simpler language tagging