Fixed languages list
Added new type NAME
Modified Other Code to specific type