Improve startup procedure