Add word matching and syntax overrides