Engine refactor.