Added support for decorated injecting and extracting