Better support for different versions of Ruby