Performance issues have been solved