Refactoring, added systemOfUnits service