Update for the latest gems