Refactoring of Injected fields #8

Please review and merge with master if all OK #8