Refactoring
Refactoring of unit initialization
Fixed bug in  with catching recursive dependencies
Refactoring
Refactoring