#1 Enhancements in various classes