Implement faster startup