Enhancements for improved performance