Updated with new languages