Improve startup time