Upgrade Ruby version
Fix field names