More performance enhancements