Defer injection

Closes #27