Added faststart optimization