[Performance Tweaks] Support