Improve start-up performance