Cleanup up a bit the examples support, added primitive reporting