Scaling and performance improvements