Update for faster startup