Add terminology and auto-advance.