Thank you.  I will have a look.  

I will continue to make this pull request for now. And I will try edm::ConsumesCollector when I can.