Added extensibiliy points to both AggregateMatcherBuilder and DarkFlowFacility (relates to #25)