Added a couple of utility functions
Improved injection for ThreadedMapper.