For faster startup