Performance-enhancements