Performance issues addressed