Improve Startup time