Updated to include new languages