Updated tools to reflect language changes