Performance changes implementation