Updated to use the latest gems.