Added suport for injection in handlers, ready for inspection and merge.