More improvements and performance enhancements