added matchers
implemented new contexts
added general context