Performance issues fix