More tools and reports for the Enumerator
Merge branch 'my'