Support Berkshelf >= 3