* More refactoring of NeoEngine