Fixed most injections.
Extracted client and param extensions.