Rule and Template structure changed to support upcoming matcher interface