[0.7.19.259] Continue refactoring.