Improved startup performance