Refactoring of Injected fields #8

Please review and merge into 1.0.x if all OK #8