Improved Performance & Scalability

Improved Performance & Scalability