Added fields injection.
Removed checking condition which is always true.
Refactoring.