Fixed Performance issues