Updated for the latest Ruby