Feature/facter 2/fact 239 aggregate resolution dsl