More Enhancements for 1.1