More refactorin on Engines/BASE, ans also, that needed changes in other files too.