Added TagMatcher to avoid list iteration
Made policy less public!