Turbo Engine refactor