Add performance tweaks