Performance-Improvements