FIX: Optimization to achieve faster connection time.