Performance Engine internals upgrades