2.x ruby enhancements