Improve performance after profiling