added trace map/reduce + event map/reduce reengineering