Refactored *Keyword and *Mapping matchers
Support aliases
Match continiously
Updated description