Implementation of #136 - Re-introduce name-based parameter injection

Implementation of #136